From 39eb23f14ec1c9ba23ede3fa62396d6afce25561 Mon Sep 17 00:00:00 2001 From: Daniel Novotny Date: Thu, 22 Apr 2010 11:52:26 +0000 Subject: [PATCH 001/182] fix #584774 --- amanda-2.6.1p2-pie.patch | 204 +++++++++++++++++++++++++++++++++++++++ amanda.spec | 9 +- 2 files changed, 210 insertions(+), 3 deletions(-) create mode 100644 amanda-2.6.1p2-pie.patch diff --git a/amanda-2.6.1p2-pie.patch b/amanda-2.6.1p2-pie.patch new file mode 100644 index 0000000..33d1ad2 --- /dev/null +++ b/amanda-2.6.1p2-pie.patch @@ -0,0 +1,204 @@ +--- 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_S3_DEVICE + 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,25 @@ + amservice 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) ++amflush_CFLAGS = -fPIE $(AM_CFLAGS) ++amflush_LDFLAGS = -pie $(AM_LDFLAGS) ++amservice_CFLAGS = -fPIE $(AM_CFLAGS) ++amservice_LDFLAGS = -pie $(AM_LDFLAGS) ++ + noinst_PROGRAMS = taper_source_test + + amlibexec_PROGRAMS = amindexd amlogroll amtrmidx \ +@@ -31,6 +46,29 @@ + planner taper amcleanupdisk \ + chunker + ++amindexd_CFLAGS = -fPIE $(AM_CFLAGS) ++amindexd_LDFLAGS = -pie $(AM_LDFLAGS) ++amcleanupdisk_CFLAGS = -fPIE $(AM_CFLAGS) ++amcleanupdisk_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 \ +diff -up ./Makefile.am.pie ./Makefile.am +--- amanda-2.6.1p2/application-src/Makefile.am.pie 2009-01-21 22:34:32.000000000 +0100 ++++ amanda-2.6.1p2/application-src/Makefile.am 2010-04-22 12:30:52.478376667 +0200 +@@ -31,6 +31,8 @@ SCRIPTS_PERL = $(CHECK_PERL) + SCRIPTS_SHELL = $(amlibexec_SCRIPTS) + + amlibexec_PROGRAMS = teecount ++teecount_CFLAGS = -fPIE $(AM_CFLAGS) ++teecount_LDFLAGS = -pie $(AM_LDFLAGS) + + #We use two variables, applicationdir applicationexecdir, to segregate the + #platform-independent (applicationdir) files installed by install-data from the +@@ -42,6 +44,10 @@ amlibexec_PROGRAMS = teecount + applicationexecdir = $(APPLICATION_DIR) + applicationdir = $(APPLICATION_DIR) + applicationexec_PROGRAMS = amgtar amstar ++amgtar_CFLAGS = -fPIE $(AM_CFLAGS) ++amgtar_LDFLAGS = -pie $(AM_LDFLAGS) ++amstar_CFLAGS = -fPIE $(AM_CFLAGS) ++amstar_LDFLAGS = -pie $(AM_LDFLAGS) + applicationexec_SCRIPTS = $(SCRIPTS_PERL) + + LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +diff -up ./Makefile.am.pie ./Makefile.am +--- amanda-2.6.1p2/amar-src/Makefile.am.pie 2008-12-01 22:17:19.000000000 +0100 ++++ amanda-2.6.1p2/amar-src/Makefile.am 2010-04-22 12:13:42.337376545 +0200 +@@ -25,6 +25,8 @@ noinst_HEADERS = \ + amar.h + + sbin_PROGRAMS = amarchiver ++amarchiver_CFLAGS = -fPIE $(AM_CFLAGS) ++amarchiver_LDFLAGS = -pie $(AM_LDFLAGS) + + amarchiver_SOURCES = amarchiver.c + amarchiver_LDADD = libamar.la diff --git a/amanda.spec b/amanda.spec index e916435..f147566 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,7 +7,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 2.6.1p2 -Release: 2%{?dist} +Release: 3%{?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 @@ -19,7 +19,7 @@ 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 +Patch5: amanda-2.6.1p2-pie.patch Patch6: amanda-2.6.1p2-ftbfs.patch License: BSD Group: Applications/System @@ -94,7 +94,7 @@ be used to develop amanda applications. %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch4 -p1 -b .lib -#%%patch5 -p1 -b .pie +%patch5 -p1 -b .pie %patch6 -p1 -b .ftbfs ./autogen @@ -408,6 +408,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %{_libdir}/libamxfer.so %changelog +* 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 From d2d0c5a826171f455a8f1d3748e24fea0d96f695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 1 Jun 2010 12:36:38 +0000 Subject: [PATCH 002/182] - Mass rebuild with perl-5.12.0 --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index f147566..0c6774a 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,7 +7,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 2.6.1p2 -Release: 3%{?dist} +Release: 4%{?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 @@ -408,6 +408,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %{_libdir}/libamxfer.so %changelog +* 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 From 780617f348db48605a183a8c193a04daf25e29e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Wed, 23 Jun 2010 12:48:41 +0000 Subject: [PATCH 003/182] unused files cleanup --- amanda-2.5.2p1-configure.patch | 23 ---- amanda-2.5.2p1-pie.patch | 199 ---------------------------- amanda-2.5.2p1-tcpport.patch | 13 -- amanda-2.5.2p1-typo_chg_multi.patch | 20 --- amanda-2.5.2p1-undefSymbols.patch | 45 ------- amanda-2.5.2p1-xattrs.patch | 58 -------- amanda-2.5.2p1-ylwrapNotFound.patch | 8 -- amanda-2.6.0b2-xattrs.patch | 58 -------- amanda-2.6.0b3-example.patch | 13 -- amanda-2.6.0p2-builderr.patch | 11 -- amanda-2.6.0p2-insec.patch | 9 -- amanda-2.6.0p2-pie.patch | 179 ------------------------- fix-amanda-tarball.sh | 39 ------ 13 files changed, 675 deletions(-) delete mode 100644 amanda-2.5.2p1-configure.patch delete mode 100644 amanda-2.5.2p1-pie.patch delete mode 100644 amanda-2.5.2p1-tcpport.patch delete mode 100644 amanda-2.5.2p1-typo_chg_multi.patch delete mode 100644 amanda-2.5.2p1-undefSymbols.patch delete mode 100644 amanda-2.5.2p1-xattrs.patch delete mode 100644 amanda-2.5.2p1-ylwrapNotFound.patch delete mode 100644 amanda-2.6.0b2-xattrs.patch delete mode 100644 amanda-2.6.0b3-example.patch delete mode 100644 amanda-2.6.0p2-builderr.patch delete mode 100644 amanda-2.6.0p2-insec.patch delete mode 100644 amanda-2.6.0p2-pie.patch delete mode 100755 fix-amanda-tarball.sh 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.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/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 From 0b98a798a5fa13010769ae87faf33082fd14005a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Mon, 28 Jun 2010 14:45:20 +0000 Subject: [PATCH 004/182] rebase + various changes --- .cvsignore | 2 +- amanda-3.1.0-example.patch | 18 ++ amanda-3.1.0-ftbfs.patch | 12 ++ amanda-xinetd | 2 +- amanda.spec | 341 +++++++++++++++++++++---------------- sources | 2 +- 6 files changed, 230 insertions(+), 147 deletions(-) create mode 100644 amanda-3.1.0-example.patch create mode 100644 amanda-3.1.0-ftbfs.patch diff --git a/.cvsignore b/.cvsignore index 7f2f7fe..e2940ab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -amanda-2.6.1p2.tar.gz +amanda-3.1.0.tar.gz diff --git a/amanda-3.1.0-example.patch b/amanda-3.1.0-example.patch new file mode 100644 index 0000000..7bee54a --- /dev/null +++ b/amanda-3.1.0-example.patch @@ -0,0 +1,18 @@ +diff -up amanda-3.1.0/example/Makefile.am.example amanda-3.1.0/example/Makefile.am +--- amanda-3.1.0/example/Makefile.am.example 2010-06-01 21:21:59.000000000 +0200 ++++ amanda-3.1.0/example/Makefile.am 2010-06-23 15:53:42.693848261 +0200 +@@ -4,10 +4,10 @@ include $(top_srcdir)/config/automake/va + include $(top_srcdir)/config/automake/installperms.am + + amanda_dir = $(amdatadir) +-templatedir = $(amanda_dir)/template.d +-server_exampledir = $(amanda_dir)/example +-client_exampledir = $(amanda_dir)/example +-lbltempldir = $(amanda_dir)/example/label-templates ++templatedir = $(localstatedir)/lib/amanda/template.d ++server_exampledir = $(sysconfdir)/amanda/example ++client_exampledir = $(sysconfdir)/amanda/example ++lbltempldir = $(sysconfdir)/amanda/example/label-templates + + template_in_FILE = \ + template.d/advanced.conf.in \ diff --git a/amanda-3.1.0-ftbfs.patch b/amanda-3.1.0-ftbfs.patch new file mode 100644 index 0000000..505e44b --- /dev/null +++ b/amanda-3.1.0-ftbfs.patch @@ -0,0 +1,12 @@ +diff -up amanda-3.1.0/common-src/glib-util.c.ftbfs amanda-3.1.0/common-src/glib-util.c +--- amanda-3.1.0/common-src/glib-util.c.ftbfs 2010-06-01 21:22:19.000000000 +0200 ++++ amanda-3.1.0/common-src/glib-util.c 2010-06-23 17:34:18.580848540 +0200 +@@ -42,7 +42,7 @@ glib_init(void) { + * is initialized) */ + #ifdef HAVE_LIBCURL + # ifdef G_THREADS_ENABLED +- g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ ++ /*g_assert(!g_thread_supported());*/ /* assert threads aren't initialized yet */ + # endif + g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); + #endif diff --git a/amanda-xinetd b/amanda-xinetd index 4574e8c..0c6a256 100644 --- a/amanda-xinetd +++ b/amanda-xinetd @@ -10,7 +10,7 @@ service amanda wait = yes user = amandabackup group = disk - server = @LIBEXECDIR@/amanda/amandad + server = /usr/sbin/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. diff --git a/amanda.spec b/amanda.spec index 0c6774a..ec624d6 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,3 +1,4 @@ +%define _libexecdir %{_libdir} %{!?defconfig:%define defconfig DailySet1} %{!?indexserver:%define indexserver amandahost} %{!?tapeserver:%define tapeserver %{indexserver}} @@ -6,22 +7,20 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 2.6.1p2 -Release: 4%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz -#Source: http://www.zmanda.com/downloads/community/community-builds/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 +Patch1: amanda-3.1.0-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.1p2-pie.patch -Patch6: amanda-2.6.1p2-ftbfs.patch -License: BSD +Patch4: amanda-3.1.0-ftbfs.patch +License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,13 +28,15 @@ 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: perl-devel 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)) +Obsoletes: amanda-devel < 2.6.1p2-5 +Provides: amanda-devel = 2.6.1p2-5 %description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a @@ -77,32 +78,22 @@ 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 +#%patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport -%patch4 -p1 -b .lib -%patch5 -p1 -b .pie -%patch6 -p1 -b .ftbfs +%patch4 -p1 -b .ftbfs ./autogen %build export MAILER=/bin/mail -%configure --enable-shared \ - --disable-rpath \ +%configure CFLAGS=-fPIE LDFLAGS=-pie \ + --enable-shared \ + --disable-rpath \ --disable-static \ --disable-dependency-tracking \ --disable-installperms \ @@ -135,16 +126,18 @@ rm -rf ${RPM_BUILD_ROOT} make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d -perl -p -e "s,\@LIBEXECDIR\@,%{_libexecdir},g" < %SOURCE5 > $RPM_BUILD_ROOT/etc/xinetd.d/amanda +cp %SOURCE5 $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%{_localstatedir}/lib/amanda install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts +ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad + cp %SOURCE9 . #pushd tape-src/.libs -#install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir} +#install -m 755 amtapetype $RPM_BUILD_ROOT/%%{_sbindir} #popd pushd ${RPM_BUILD_ROOT} @@ -167,7 +160,7 @@ make check rm -rf ${RPM_BUILD_ROOT} %pre -# look for user 'amanda' with uid 33, if exists, rename to new %amanda_user +# 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 @@ -187,7 +180,7 @@ mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null # 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 || : +# sed -i.usernameupdate -r -e 's/^([^[:blank:]]+[[:blank:]]+)amanda([[:blank:]].*)?$/\1%%amanda_user\2/' /var/lib/amanda/.amandahosts || : %postun /sbin/ldconfig @@ -214,43 +207,99 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %files %defattr(-,root,root) +%doc COPYRIGHT* NEWS README README-rpm %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 + %{_libdir}/libamanda.so + %{_libdir}/libamandad*.so + %{_libdir}/libamar*.so + %{_libdir}/libamglue*.so + %{_libdir}/libamxfer*.so + %{_libdir}/libndmjob*.so + %{_libdir}/libndmlib*.so %attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad %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) %{_libexecdir}/amanda/amcat.awk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amndmjob +%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 +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/ndmjob + +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amandad +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver - %{_mandir}/man8/amrestore.8* - %{_mandir}/man8/amarchiver.8* - %{_mandir}/man8/script-email.8* +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot + +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Archive.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/BigIntCompat.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ClientService.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Config.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Constants.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Debug.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Feature.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Header.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/IPC +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/MainLoop.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/NDMP.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Paths.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Process.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script_App.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tests.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Util.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Xfer.pm + +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Archive/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Config/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Debug/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Feature/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Header/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/IPC/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/MainLoop/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/NDMP/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tests/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Util/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Xfer/ + %{_mandir}/man5/amanda-archive-format.5* + %{_mandir}/man7/amanda-compatibility.7* + %{_mandir}/man5/amanda.conf* %{_mandir}/man7/amanda-auth.7* - %{_mandir}/man7/amanda-scripts.7* + %{_mandir}/man7/amanda-scripts.7* + %{_mandir}/man8/amanda.8* + %{_mandir}/man8/amarchiver.8* + %{_mandir}/man8/amplot.8* + %{_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* + %attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts %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 -%{_mandir}/man5/amanda.conf* %files server %defattr(-,root,root) -%doc COPYRIGHT* NEWS README + %{_libdir}/libamdevice*.so + %{_libdir}/libamserver*.so +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcheck-device %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amidxtaped %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amindexd %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amlogroll @@ -258,13 +307,12 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %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-disk %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-iomega %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh %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 @@ -274,47 +322,85 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %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 - -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chunker +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay %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}/amdevcheck %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush +%attr(4750,root,%amanda_group) %{_sbindir}/amcheck +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel %attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore %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}/amstatus +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc %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 + +%{_mandir}/man5/disklist.5* +%{_mandir}/man5/tapelist.5* +%{_mandir}/man7/amanda-devices.7* +%{_mandir}/man7/amanda-changers.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* + +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Cmdline.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/DB/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Device.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Disklist.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Holding.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Logfile.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Recovery/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tapelist.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Taper/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/XferServer.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Cmdline/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Device/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Disklist/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Logfile/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tapelist/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/XferServer/ %attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/ %attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/index @@ -322,50 +408,13 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %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 +%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.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* - %files client %defattr(-,root,root) -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad + %{_libdir}/libamclient*.so %attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/application/ %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp @@ -376,38 +425,42 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %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* +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover + %{_mandir}/man7/amanda-applications.7* + %{_mandir}/man5/amanda-client.conf.5* %{_mandir}/man8/amgtar.8* + %{_mandir}/man8/ampgsql.8* + %{_mandir}/man8/amraw.8* + %{_mandir}/man8/amrecover.8* %{_mandir}/man8/amsamba.8* %{_mandir}/man8/amstar.8* + %{_mandir}/man8/amsuntar.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) %{perl_vendorarch}/Amanda/Application.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Application/ + %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 - -%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 +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf %changelog +* 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 @@ -466,7 +519,7 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | - 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 +- Move %%{_libexecdir}/amanda/amanda-sh-lib.sh to main package - LIBEXECDIR is used in xinetd template - Make calcsize setuid root diff --git a/sources b/sources index 7bfe76a..7849c1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -816ef0101b6d968c5df7d7d7e793caed amanda-2.6.1p2.tar.gz +86f1e3e052d336849a60b46f876fc0e4 amanda-3.1.0.tar.gz From 7889798727aa5bd8fc4e4ddf3204181706b8566e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:47:36 +0000 Subject: [PATCH 005/182] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore 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) From 3146317137a27f60cf45a7c050e135c8c0fecc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Tue, 3 Aug 2010 15:05:10 +0200 Subject: [PATCH 006/182] upgrade to new upstream release, fixes #600552, #610169 and some other fixes --- .gitignore | 1 + amanda-2.6.0b3-lib.patch | 31 -- amanda-2.6.1p2-example.patch | 16 - amanda-2.6.1p2-ftbfs.patch | 12 - amanda-2.6.1p2-pie.patch | 204 ------------- amanda-2.6.1p2-xattrs.patch | 61 ---- amanda-3.1.0-example.patch | 6 +- amanda-3.1.1-xattrs.patch | 55 ++++ amanda.spec | 567 +++++++++++++++++------------------ sources | 2 +- 10 files changed, 331 insertions(+), 624 deletions(-) delete mode 100644 amanda-2.6.0b3-lib.patch delete mode 100644 amanda-2.6.1p2-example.patch delete mode 100644 amanda-2.6.1p2-ftbfs.patch delete mode 100644 amanda-2.6.1p2-pie.patch delete mode 100644 amanda-2.6.1p2-xattrs.patch create mode 100644 amanda-3.1.1-xattrs.patch diff --git a/.gitignore b/.gitignore index e2940ab..9d8dfa9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ amanda-3.1.0.tar.gz +amanda-3.1.1.tar.gz 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.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-pie.patch b/amanda-2.6.1p2-pie.patch deleted file mode 100644 index 33d1ad2..0000000 --- a/amanda-2.6.1p2-pie.patch +++ /dev/null @@ -1,204 +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_S3_DEVICE - 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,25 @@ - amservice 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) -+amflush_CFLAGS = -fPIE $(AM_CFLAGS) -+amflush_LDFLAGS = -pie $(AM_LDFLAGS) -+amservice_CFLAGS = -fPIE $(AM_CFLAGS) -+amservice_LDFLAGS = -pie $(AM_LDFLAGS) -+ - noinst_PROGRAMS = taper_source_test - - amlibexec_PROGRAMS = amindexd amlogroll amtrmidx \ -@@ -31,6 +46,29 @@ - planner taper amcleanupdisk \ - chunker - -+amindexd_CFLAGS = -fPIE $(AM_CFLAGS) -+amindexd_LDFLAGS = -pie $(AM_LDFLAGS) -+amcleanupdisk_CFLAGS = -fPIE $(AM_CFLAGS) -+amcleanupdisk_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 \ -diff -up ./Makefile.am.pie ./Makefile.am ---- amanda-2.6.1p2/application-src/Makefile.am.pie 2009-01-21 22:34:32.000000000 +0100 -+++ amanda-2.6.1p2/application-src/Makefile.am 2010-04-22 12:30:52.478376667 +0200 -@@ -31,6 +31,8 @@ SCRIPTS_PERL = $(CHECK_PERL) - SCRIPTS_SHELL = $(amlibexec_SCRIPTS) - - amlibexec_PROGRAMS = teecount -+teecount_CFLAGS = -fPIE $(AM_CFLAGS) -+teecount_LDFLAGS = -pie $(AM_LDFLAGS) - - #We use two variables, applicationdir applicationexecdir, to segregate the - #platform-independent (applicationdir) files installed by install-data from the -@@ -42,6 +44,10 @@ amlibexec_PROGRAMS = teecount - applicationexecdir = $(APPLICATION_DIR) - applicationdir = $(APPLICATION_DIR) - applicationexec_PROGRAMS = amgtar amstar -+amgtar_CFLAGS = -fPIE $(AM_CFLAGS) -+amgtar_LDFLAGS = -pie $(AM_LDFLAGS) -+amstar_CFLAGS = -fPIE $(AM_CFLAGS) -+amstar_LDFLAGS = -pie $(AM_LDFLAGS) - applicationexec_SCRIPTS = $(SCRIPTS_PERL) - - LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -diff -up ./Makefile.am.pie ./Makefile.am ---- amanda-2.6.1p2/amar-src/Makefile.am.pie 2008-12-01 22:17:19.000000000 +0100 -+++ amanda-2.6.1p2/amar-src/Makefile.am 2010-04-22 12:13:42.337376545 +0200 -@@ -25,6 +25,8 @@ noinst_HEADERS = \ - amar.h - - sbin_PROGRAMS = amarchiver -+amarchiver_CFLAGS = -fPIE $(AM_CFLAGS) -+amarchiver_LDFLAGS = -pie $(AM_LDFLAGS) - - amarchiver_SOURCES = amarchiver.c - amarchiver_LDADD = libamar.la 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.0-example.patch b/amanda-3.1.0-example.patch index 7bee54a..ee9ea2c 100644 --- a/amanda-3.1.0-example.patch +++ b/amanda-3.1.0-example.patch @@ -1,15 +1,13 @@ diff -up amanda-3.1.0/example/Makefile.am.example amanda-3.1.0/example/Makefile.am --- amanda-3.1.0/example/Makefile.am.example 2010-06-01 21:21:59.000000000 +0200 +++ amanda-3.1.0/example/Makefile.am 2010-06-23 15:53:42.693848261 +0200 -@@ -4,10 +4,10 @@ include $(top_srcdir)/config/automake/va - include $(top_srcdir)/config/automake/installperms.am +@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va amanda_dir = $(amdatadir) --templatedir = $(amanda_dir)/template.d + templatedir = $(amanda_dir)/template.d -server_exampledir = $(amanda_dir)/example -client_exampledir = $(amanda_dir)/example -lbltempldir = $(amanda_dir)/example/label-templates -+templatedir = $(localstatedir)/lib/amanda/template.d +server_exampledir = $(sysconfdir)/amanda/example +client_exampledir = $(sysconfdir)/amanda/example +lbltempldir = $(sysconfdir)/amanda/example/label-templates 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.spec b/amanda.spec index ec624d6..2e1b886 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,4 +1,4 @@ -%define _libexecdir %{_libdir} +%define _libexecdir %{_libdir} %{!?defconfig:%define defconfig DailySet1} %{!?indexserver:%define indexserver amandahost} %{!?tapeserver:%define tapeserver %{indexserver}} @@ -7,17 +7,16 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?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-3.1.0-example.patch -Patch2: amanda-2.6.1p2-xattrs.patch +Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-2.6.0p2-tcpport.patch Patch4: amanda-3.1.0-ftbfs.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 @@ -56,7 +55,6 @@ Summary: The client component of the AMANDA tape backup system Group: Applications/System Requires: fileutils grep /sbin/service Requires(pre): amanda = %{version}-%{release} -Requires(post): grep sed %description client The Amanda-client package should be installed on any machine that will @@ -69,7 +67,6 @@ Summary: The server side of the AMANDA tape backup system Group: Applications/System Requires: fileutils grep /sbin/service Requires(pre): amanda = %{version}-%{release} -Requires(post): grep sed findutils %description server The amanda-server package should be installed on the AMANDA server, @@ -78,50 +75,47 @@ 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. -#%%define _default_patch_fuzz 3 - %prep %setup -q -n %{name}-%{version} %patch1 -p1 -b .example -#%patch2 -p1 -b .xattrs +%patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch4 -p1 -b .ftbfs ./autogen %build -export MAILER=/bin/mail +export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie -%configure CFLAGS=-fPIE LDFLAGS=-pie \ - --enable-shared \ - --disable-rpath \ - --disable-static \ - --disable-dependency-tracking \ - --disable-installperms \ - --with-amlibdir=%{_libdir} \ - --with-amperldir=%{perl_vendorarch} \ - --with-index-server=%{indexserver} \ - --with-tape-server=%{tapeserver} \ - --with-config=%{defconfig} \ - --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \ - --with-smbclient=%{_bindir}/smbclient \ - --with-amandates=%{_localstatedir}/lib/amanda/amandates \ - --with-amandahosts \ - --with-user=%amanda_user \ - --with-group=%amanda_group \ - --with-tmpdir=/var/log/amanda \ - --with-gnutar=/bin/tar \ - --with-ssh-security \ - --with-rsh-security \ - --with-bsdtcp-security \ - --with-bsdudp-security \ - --with-krb5-security - +%configure --enable-shared \ + --disable-rpath \ + --disable-static \ + --disable-dependency-tracking \ + --disable-installperms \ + --with-amdatadir=%{_localstatedir}/lib/amanda \ + --with-amlibdir=%{_libdir} \ + --with-amperldir=%{perl_vendorarch} \ + --with-index-server=%{indexserver} \ + --with-tape-server=%{tapeserver} \ + --with-config=%{defconfig} \ + --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \ + --with-smbclient=%{_bindir}/smbclient \ + --with-amandates=%{_localstatedir}/lib/amanda/amandates \ + --with-amandahosts \ + --with-user=%amanda_user \ + --with-group=%amanda_group \ + --with-tmpdir=/var/log/amanda \ + --with-gnutar=/bin/tar \ + --with-ssh-security \ + --with-rsh-security \ + --with-bsdtcp-security \ + --with-bsdudp-security \ + --with-krb5-security + make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} -#export SED=sed make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT @@ -136,9 +130,7 @@ ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad cp %SOURCE9 . -#pushd tape-src/.libs -#install -m 755 amtapetype $RPM_BUILD_ROOT/%%{_sbindir} -#popd +ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8 pushd ${RPM_BUILD_ROOT} mv .%{_sysconfdir}/amanda/example .%{_sysconfdir}/amanda/%defconfig @@ -160,46 +152,21 @@ make check 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 || : + -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 || : - [ -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 || : %postun /sbin/ldconfig [ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : -%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 || : +%post server -p /sbin/ldconfig %postun client -p /sbin/ldconfig @@ -207,249 +174,259 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %files %defattr(-,root,root) -%doc COPYRIGHT* NEWS README README-rpm - %config(noreplace) /etc/xinetd.d/amanda -%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so - %{_libdir}/libamanda.so - %{_libdir}/libamandad*.so - %{_libdir}/libamar*.so - %{_libdir}/libamglue*.so - %{_libdir}/libamxfer*.so - %{_libdir}/libndmjob*.so - %{_libdir}/libndmlib*.so -%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amndmjob -%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 -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/ndmjob +%doc COPYRIGHT* NEWS README README-rpm + %config(noreplace) /etc/xinetd.d/amanda +%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so + %{_libdir}/libamanda.so + %{_libdir}/libamandad*.so + %{_libdir}/libamar*.so + %{_libdir}/libamglue*.so + %{_libdir}/libamxfer*.so + %{_libdir}/libndmjob*.so + %{_libdir}/libndmlib*.so +%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amndmjob +%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 +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/ndmjob -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amandad -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amandad +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Archive.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/BigIntCompat.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ClientService.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Config.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Constants.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Debug.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Feature.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Header.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/IPC -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/MainLoop.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/NDMP.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Paths.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Process.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script_App.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tests.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Util.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Xfer.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Archive.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/BigIntCompat.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ClientService.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Config.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Constants.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Debug.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Feature.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Header.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/IPC +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/MainLoop.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/NDMP.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Paths.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Process.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script_App.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tests.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Util.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Xfer.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Archive/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Config/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Debug/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Feature/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Header/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/IPC/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/MainLoop/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/NDMP/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tests/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Util/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Xfer/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Archive/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Config/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Debug/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Feature/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Header/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/IPC/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/MainLoop/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/NDMP/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tests/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Util/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Xfer/ - %{_mandir}/man5/amanda-archive-format.5* - %{_mandir}/man7/amanda-compatibility.7* - %{_mandir}/man5/amanda.conf* - %{_mandir}/man7/amanda-auth.7* - %{_mandir}/man7/amanda-scripts.7* - %{_mandir}/man8/amanda.8* - %{_mandir}/man8/amarchiver.8* - %{_mandir}/man8/amplot.8* - %{_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}/man5/amanda-archive-format.5* + %{_mandir}/man7/amanda-compatibility.7* + %{_mandir}/man5/amanda.conf* + %{_mandir}/man7/amanda-auth.7* + %{_mandir}/man7/amanda-scripts.7* + %{_mandir}/man8/amanda.8* + %{_mandir}/man8/amarchiver.8* + %{_mandir}/man8/amplot.8* + %{_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* -%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts +%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts %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 +%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 %files server %defattr(-,root,root) - %{_libdir}/libamdevice*.so - %{_libdir}/libamserver*.so -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcheck-device -%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(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk -%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-iomega -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh -%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/chunker -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush -%attr(4750,root,%amanda_group) %{_sbindir}/amcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amvault + %{_libdir}/libamdevice*.so + %{_libdir}/libamserver*.so +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcheck-device +%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(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk +%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-iomega +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh +%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/chunker +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush +%attr(4750,root,%amanda_group) %{_sbindir}/amcheck +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amvault -%{_mandir}/man5/disklist.5* -%{_mandir}/man5/tapelist.5* -%{_mandir}/man7/amanda-devices.7* -%{_mandir}/man7/amanda-changers.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}/man5/disklist.5* + %{_mandir}/man5/tapelist.5* + %{_mandir}/man7/amanda-devices.7* + %{_mandir}/man7/amanda-changers.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* -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Cmdline.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/DB/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Device.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Disklist.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Holding.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Logfile.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Recovery/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tapelist.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Taper/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/XferServer.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Cmdline/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Device/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Disklist/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Logfile/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tapelist/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/XferServer/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Cmdline.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/DB/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Device.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Disklist.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Holding.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Logfile.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Recovery/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tapelist.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Taper/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/XferServer.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Cmdline/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Device/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Disklist/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Logfile/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tapelist/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/XferServer/ -%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 -%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf -%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/* +%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 +%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf +%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) - %{_libdir}/libamclient*.so -%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/teecount -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover - %{_mandir}/man7/amanda-applications.7* - %{_mandir}/man5/amanda-client.conf.5* - %{_mandir}/man8/amgtar.8* - %{_mandir}/man8/ampgsql.8* - %{_mandir}/man8/amraw.8* - %{_mandir}/man8/amrecover.8* - %{_mandir}/man8/amsamba.8* - %{_mandir}/man8/amstar.8* - %{_mandir}/man8/amsuntar.8* - %{_mandir}/man8/amzfs-sendrecv.8* - %{_mandir}/man8/amzfs-snapshot.8* +%defattr(-,root,root) + %{_libdir}/libamclient*.so +%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/teecount +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover + %{_mandir}/man7/amanda-applications.7* + %{_mandir}/man5/amanda-client.conf.5* + %{_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* -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Application/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application.pm +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application/ +%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Application/ -%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 -%attr(-,%amanda_user,%amanda_group) %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(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf %changelog +* 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 @@ -859,7 +836,7 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | * 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. + BuildRequires for dump. * Thu Feb 10 2000 Tim Powers - strip binaries @@ -869,14 +846,14 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | * Tue Jan 11 2000 Tim Powers - make sure the man pages are gzipped in each subpackage, overriding the build - system spec_install_post macro. + 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 ;) + 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) + 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) diff --git a/sources b/sources index 7849c1b..3da1de8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86f1e3e052d336849a60b46f876fc0e4 amanda-3.1.0.tar.gz +94ce893d211d9876ed2d9b33c46cef33 amanda-3.1.1.tar.gz From ea87af0592411764fd85b6b3ce837c97fa33fb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Tue, 10 Aug 2010 15:34:22 +0200 Subject: [PATCH 007/182] modified default client configuration and tcpport patch --- README-rpm | 12 ------------ amanda-3.1.1-bsd.patch | 28 ++++++++++++++++++++++++++++ amanda.spec | 17 ++++++++++------- 3 files changed, 38 insertions(+), 19 deletions(-) delete mode 100644 README-rpm create mode 100644 amanda-3.1.1-bsd.patch 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/amanda-3.1.1-bsd.patch b/amanda-3.1.1-bsd.patch new file mode 100644 index 0000000..dc65d94 --- /dev/null +++ b/amanda-3.1.1-bsd.patch @@ -0,0 +1,28 @@ +diff -up amanda-3.1.1/example/amanda-client.conf.in.bsd amanda-3.1.1/example/amanda-client.conf.in +--- amanda-3.1.1/example/amanda-client.conf.in.bsd 2010-08-10 12:26:03.000000000 +0200 ++++ amanda-3.1.1/example/amanda-client.conf.in 2010-08-10 14:37:54.027754862 +0200 +@@ -17,8 +17,8 @@ tapedev "@EXAMPLE_TAPEDEV@" # your + # auth - authentication scheme to use between server and client. + # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local", + # "rsh" and "ssh". +-# Default: [auth "bsdtcp"] +-auth "bsdtcp" ++# Default: [auth "bsd"] ++auth "bsd" + + ssh_keys "" # your ssh keys file if you use ssh auth + +diff -up amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd amanda-3.1.1/example/amanda-client-postgresql.conf.in +--- amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd 2010-06-29 19:09:55.000000000 +0200 ++++ amanda-3.1.1/example/amanda-client-postgresql.conf.in 2010-08-10 14:38:00.522754862 +0200 +@@ -16,8 +16,8 @@ tape_server "@DEFAULT_TAPE_SERVER@" # y + # auth - authentication scheme to use between server and client. + # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local", + # "rsh" and "ssh". +-# Default: [auth "bsdtcp"] +-auth "bsdtcp" ++# Default: [auth "bsd"] ++auth "bsd" + + # your ssh keys file if you use ssh auth + ssh_keys "/var/lib/amanda/.ssh/id_rsa_amrecover" diff --git a/amanda.spec b/amanda.spec index 2e1b886..de16732 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,17 +8,17 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist Source5: amanda-xinetd Source8: amandahosts -Source9: README-rpm Patch1: amanda-3.1.0-example.patch Patch2: amanda-3.1.1-xattrs.patch -Patch3: amanda-2.6.0p2-tcpport.patch +Patch3: amanda-3.1.1-tcpport.patch Patch4: amanda-3.1.0-ftbfs.patch +Patch5: amanda-3.1.1-bsd.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -81,6 +81,7 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch4 -p1 -b .ftbfs +%patch5 -p1 -b .bsd ./autogen %build @@ -127,9 +128,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad - -cp %SOURCE9 . - ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8 pushd ${RPM_BUILD_ROOT} @@ -174,7 +172,7 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%doc COPYRIGHT* NEWS README README-rpm +%doc COPYRIGHT* NEWS README %config(noreplace) /etc/xinetd.d/amanda %attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so %{_libdir}/libamanda.so @@ -418,6 +416,11 @@ rm -rf ${RPM_BUILD_ROOT} %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf %changelog +* 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 From e7025d2edbe47eee2d40271ddccbb7904c5a5eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Tue, 10 Aug 2010 15:39:29 +0200 Subject: [PATCH 008/182] uploaded new tcpport patch --- amanda-2.6.0p2-tcpport.patch | 21 --------------------- amanda-3.1.1-tcpport.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 21 deletions(-) delete mode 100644 amanda-2.6.0p2-tcpport.patch create mode 100644 amanda-3.1.1-tcpport.patch 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-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 From bdd0f04ded77a9141232bbb7ae63c1542fe866f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Tue, 24 Aug 2010 10:49:46 +0200 Subject: [PATCH 009/182] new upstream release --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index de16732..0c79451 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,8 +7,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -416,6 +416,9 @@ rm -rf ${RPM_BUILD_ROOT} %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf %changelog +* 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 From 466dff7dcce1b0b46d29fa21ed2fce64c2375561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Tue, 24 Aug 2010 10:54:03 +0200 Subject: [PATCH 010/182] updated sources file --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9d8dfa9..49ae7bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ amanda-3.1.0.tar.gz amanda-3.1.1.tar.gz +/amanda-3.1.2.tar.gz diff --git a/sources b/sources index 3da1de8..cf7927e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94ce893d211d9876ed2d9b33c46cef33 amanda-3.1.1.tar.gz +021c8ef3bd66c7e3fc070593784e5929 amanda-3.1.2.tar.gz From 6ea791cef48d8347988c5515f6dd0b29eabcb140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Thu, 7 Oct 2010 13:48:27 +0200 Subject: [PATCH 011/182] upstream security update --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 49ae7bc..6adc01e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ amanda-3.1.0.tar.gz amanda-3.1.1.tar.gz /amanda-3.1.2.tar.gz +/amanda-3.1.3.tar.gz diff --git a/sources b/sources index cf7927e..409fe21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -021c8ef3bd66c7e3fc070593784e5929 amanda-3.1.2.tar.gz +f72fa06d4f90f7997b17ded1d7b4314e amanda-3.1.3.tar.gz From b427de4c86ace4186bd822276c2ae56d0129dfb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Thu, 7 Oct 2010 13:48:58 +0200 Subject: [PATCH 012/182] upstream security update - 2nd commit --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 0c79451..17e27f8 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,7 +7,7 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab @@ -416,6 +416,9 @@ rm -rf ${RPM_BUILD_ROOT} %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf %changelog +* 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 From bde2c8db1a2901cb9445f4d032a9713072c29772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Thu, 4 Nov 2010 17:09:28 +0100 Subject: [PATCH 013/182] - upgrade to new upstream release - 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) --- .gitignore | 1 + amanda-3.2.0-config-dir.patch | 19 ++ amanda.spec | 458 +++++++++++++++++----------------- sources | 2 +- 4 files changed, 254 insertions(+), 226 deletions(-) create mode 100644 amanda-3.2.0-config-dir.patch diff --git a/.gitignore b/.gitignore index 6adc01e..e451a5f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ amanda-3.1.0.tar.gz amanda-3.1.1.tar.gz /amanda-3.1.2.tar.gz /amanda-3.1.3.tar.gz +/amanda-3.2.0.tar.gz 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.spec b/amanda.spec index 17e27f8..bc29787 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,7 +7,7 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.1.3 +Version: 3.2.0 Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab @@ -19,6 +19,7 @@ Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch4: amanda-3.1.0-ftbfs.patch Patch5: amanda-3.1.1-bsd.patch +Patch6: amanda-3.2.0-config-dir.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -37,6 +38,8 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Obsoletes: amanda-devel < 2.6.1p2-5 Provides: amanda-devel = 2.6.1p2-5 +%global __perl_provides /bin/sh -c "/usr/lib/rpm/perl.prov | grep -v \\\"perl(Math::BigInt)\\\"" + %description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a backup system that allows the administrator of a LAN to set up a @@ -82,6 +85,7 @@ server also needs to have the amanda-client package installed. %patch3 -p1 -b .tcpport %patch4 -p1 -b .ftbfs %patch5 -p1 -b .bsd +%patch6 -p1 -b .config ./autogen %build @@ -135,6 +139,8 @@ pushd ${RPM_BUILD_ROOT} 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 @@ -172,250 +178,252 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%doc COPYRIGHT* NEWS README - %config(noreplace) /etc/xinetd.d/amanda -%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so - %{_libdir}/libamanda.so - %{_libdir}/libamandad*.so - %{_libdir}/libamar*.so - %{_libdir}/libamglue*.so - %{_libdir}/libamxfer*.so - %{_libdir}/libndmjob*.so - %{_libdir}/libndmlib*.so -%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amndmjob -%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 -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/ndmjob +%doc COPYRIGHT* NEWS README +%config(noreplace) /etc/xinetd.d/amanda -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amandad -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot +%{_libdir}/libamanda-*.so +%{_libdir}/libamanda.so +%{_libdir}/libamandad*.so +%{_libdir}/libamar*.so +%{_libdir}/libamglue*.so +%{_libdir}/libamxfer*.so +%{_libdir}/libndmjob*.so +%{_libdir}/libndmlib*.so -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Archive.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/BigIntCompat.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ClientService.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Config.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Constants.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Debug.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Feature.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Header.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/IPC -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/MainLoop.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/NDMP.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Paths.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Process.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script_App.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Script.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tests.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Util.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Xfer.pm +%dir %{_libexecdir}/amanda +%{_libexecdir}/amanda/amandad +%{_libexecdir}/amanda/amanda-sh-lib.sh +%{_libexecdir}/amanda/amcat.awk +%{_libexecdir}/amanda/amndmjob +%{_libexecdir}/amanda/amplot.awk +%{_libexecdir}/amanda/amplot.g +%{_libexecdir}/amanda/amplot.gp +%{_libexecdir}/amanda/ndmjob -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Archive/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Config/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Debug/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Feature/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Header/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/IPC/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/MainLoop/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/NDMP/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tests/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Util/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Xfer/ +%{_sbindir}/amandad +%{_sbindir}/amaespipe +%{_sbindir}/amarchiver +%{_sbindir}/amcrypt +%{_sbindir}/amcrypt-ossl +%{_sbindir}/amcrypt-ossl-asym +%{_sbindir}/amcryptsimple +%{_sbindir}/amgetconf +%{_sbindir}/amgpgcrypt +%{_sbindir}/amplot - %{_mandir}/man5/amanda-archive-format.5* - %{_mandir}/man7/amanda-compatibility.7* - %{_mandir}/man5/amanda.conf* - %{_mandir}/man7/amanda-auth.7* - %{_mandir}/man7/amanda-scripts.7* - %{_mandir}/man8/amanda.8* - %{_mandir}/man8/amarchiver.8* - %{_mandir}/man8/amplot.8* - %{_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* +%{perl_vendorarch}/Amanda/Archive.pm +%{perl_vendorarch}/Amanda/BigIntCompat.pm +%{perl_vendorarch}/Amanda/ClientService.pm +%{perl_vendorarch}/Amanda/Config.pm +%{perl_vendorarch}/Amanda/Config/ +%{perl_vendorarch}/Amanda/Constants.pm +%{perl_vendorarch}/Amanda/Debug.pm +%{perl_vendorarch}/Amanda/Feature.pm +%{perl_vendorarch}/Amanda/Header.pm +%{perl_vendorarch}/Amanda/IPC +%{perl_vendorarch}/Amanda/MainLoop.pm +%{perl_vendorarch}/Amanda/NDMP.pm +%{perl_vendorarch}/Amanda/Paths.pm +%{perl_vendorarch}/Amanda/Process.pm +%{perl_vendorarch}/Amanda/Script_App.pm +%{perl_vendorarch}/Amanda/Script.pm +%{perl_vendorarch}/Amanda/Tests.pm +%{perl_vendorarch}/Amanda/Util.pm +%{perl_vendorarch}/Amanda/Xfer.pm +%{perl_vendorarch}/auto/Amanda/Archive/ +%{perl_vendorarch}/auto/Amanda/Config/ +%{perl_vendorarch}/auto/Amanda/Debug/ +%{perl_vendorarch}/auto/Amanda/Feature/ +%{perl_vendorarch}/auto/Amanda/Header/ +%{perl_vendorarch}/auto/Amanda/IPC/ +%{perl_vendorarch}/auto/Amanda/MainLoop/ +%{perl_vendorarch}/auto/Amanda/NDMP/ +%{perl_vendorarch}/auto/Amanda/Tests/ +%{perl_vendorarch}/auto/Amanda/Util/ +%{perl_vendorarch}/auto/Amanda/Xfer/ -%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts +%{_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* +%{_mandir}/man8/amplot.8* +%{_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* + +%dir %{_sysconfdir}/amanda/ +%dir %{_sysconfdir}/amanda/%defconfig -%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 - +%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts +%attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda %files server %defattr(-,root,root) - %{_libdir}/libamdevice*.so - %{_libdir}/libamserver*.so -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcheck-device -%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(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk -%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-iomega -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh -%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/chunker -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush -%attr(4750,root,%amanda_group) %{_sbindir}/amcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amvault +%{_libdir}/libamdevice*.so +%{_libdir}/libamserver*.so +%{_libexecdir}/amanda/amcleanupdisk +%{_libexecdir}/amanda/amcheck-device +%{_libexecdir}/amanda/amidxtaped +%{_libexecdir}/amanda/amindexd +%{_libexecdir}/amanda/amlogroll +%{_libexecdir}/amanda/amtrmidx +%{_libexecdir}/amanda/amtrmlog +%{_libexecdir}/amanda/driver +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper +%{_libexecdir}/amanda/chg-disk +%{_libexecdir}/amanda/chg-lib.sh +%{_libexecdir}/amanda/chg-manual +%{_libexecdir}/amanda/chg-multi +%{_libexecdir}/amanda/chg-zd-mtx +%{_libexecdir}/amanda/chunker +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner +%{_libexecdir}/amanda/taper +%{_sbindir}/activate-devpay +%{_sbindir}/amaddclient +%{_sbindir}/amadmin +%{_sbindir}/amcleanup +%{_sbindir}/amdevcheck +%{_sbindir}/amdump +%{_sbindir}/amfetchdump +%{_sbindir}/amflush +%attr(4750,root,%amanda_group) %{_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 - %{_mandir}/man5/disklist.5* - %{_mandir}/man5/tapelist.5* - %{_mandir}/man7/amanda-devices.7* - %{_mandir}/man7/amanda-changers.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}/man5/disklist.5* +%{_mandir}/man5/tapelist.5* +%{_mandir}/man7/amanda-devices.7* +%{_mandir}/man7/amanda-changers.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* -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Cmdline.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Curinfo.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/DB/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Device.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Disklist.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Holding.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Changer.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Interactive.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Logfile.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Recovery/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Report.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Tapelist.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Taper/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/XferServer.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Cmdline/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Device/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Disklist/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Logfile/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Tapelist/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/XferServer/ +%{perl_vendorarch}/Amanda/Cmdline.pm +%{perl_vendorarch}/Amanda/Curinfo/ +%{perl_vendorarch}/Amanda/Curinfo.pm +%{perl_vendorarch}/Amanda/DB/ +%{perl_vendorarch}/Amanda/Device.pm +%{perl_vendorarch}/Amanda/Disklist.pm +%{perl_vendorarch}/Amanda/Holding.pm +%{perl_vendorarch}/Amanda/Changer/ +%{perl_vendorarch}/Amanda/Changer.pm +%{perl_vendorarch}/Amanda/Interactive/ +%{perl_vendorarch}/Amanda/Interactive.pm +%{perl_vendorarch}/Amanda/Logfile.pm +%{perl_vendorarch}/Amanda/Recovery/ +%{perl_vendorarch}/Amanda/Report/ +%{perl_vendorarch}/Amanda/Report.pm +%{perl_vendorarch}/Amanda/Tapelist.pm +%{perl_vendorarch}/Amanda/Taper/ +%{perl_vendorarch}/Amanda/XferServer.pm +%{perl_vendorarch}/auto/Amanda/Cmdline/ +%{perl_vendorarch}/auto/Amanda/Device/ +%{perl_vendorarch}/auto/Amanda/Disklist/ +%{perl_vendorarch}/auto/Amanda/Logfile/ +%{perl_vendorarch}/auto/Amanda/Tapelist/ +%{perl_vendorarch}/auto/Amanda/XferServer/ -%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 -%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf -%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/* +%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) - %{_libdir}/libamclient*.so -%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/teecount -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover - %{_mandir}/man7/amanda-applications.7* - %{_mandir}/man5/amanda-client.conf.5* - %{_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* +%{_libdir}/libamclient*.so +%{_libexecdir}/amanda/application/ +%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}/amoldrecover +%{_sbindir}/amrecover -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application.pm -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/Application/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/Application/ +%{_mandir}/man7/amanda-applications.7* +%{_mandir}/man5/amanda-client.conf.5* +%{_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* + +%{perl_vendorarch}/Amanda/Application.pm +%{perl_vendorarch}/Amanda/Application/ +%{perl_vendorarch}/auto/Amanda/Application/ + +%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(-,%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 -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf %changelog +* Thu Nov 4 2010 Jan Görig - 3.2.0-1 +- upgrade to new upstream release +- 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 diff --git a/sources b/sources index 409fe21..c020967 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f72fa06d4f90f7997b17ded1d7b4314e amanda-3.1.3.tar.gz +df73a318af8f04e9ad2ecb4d59dc052c amanda-3.2.0.tar.gz From af029f0b3f16d18e83872ef81ad137221d3dc68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Thu, 4 Nov 2010 18:21:30 +0100 Subject: [PATCH 014/182] fixed build with new glib --- amanda-3.2.0-glib.patch | 320 ++++++++++++++++++++++++++++++++++++++++ amanda.spec | 3 + 2 files changed, 323 insertions(+) create mode 100644 amanda-3.2.0-glib.patch diff --git a/amanda-3.2.0-glib.patch b/amanda-3.2.0-glib.patch new file mode 100644 index 0000000..b3f5519 --- /dev/null +++ b/amanda-3.2.0-glib.patch @@ -0,0 +1,320 @@ +diff --git a/client-src/client_util.c b/client-src/client_util.c +index 5dc4974..051a317 100644 +--- a/client-src/client_util.c ++++ b/client-src/client_util.c +@@ -1009,7 +1009,7 @@ run_client_script( + script->result = g_new0(client_script_result_t, 1); + script->result->proplist = + g_hash_table_new_full(g_str_hash, g_str_equal, +- &g_free, &g_slist_free_full_gpointer); ++ &g_free, &g_amanda_slist_free_full_gpointer); + script->result->output = g_ptr_array_new(); + script->result->err = g_ptr_array_new(); + +diff --git a/common-src/amxml.c b/common-src/amxml.c +index fedf5cc..8fa0d2b 100644 +--- a/common-src/amxml.c ++++ b/common-src/amxml.c +@@ -86,7 +86,7 @@ free_dle( + amfree(dle->device); + amfree(dle->program); + g_slist_free(dle->estimatelist); +- g_slist_free_full(dle->levellist); ++ g_amanda_slist_free_full(dle->levellist); + amfree(dle->dumpdate); + amfree(dle->compprog); + amfree(dle->srv_encrypt); +@@ -104,8 +104,8 @@ free_dle( + scriptlist = scriptlist->next) { + free_script_data((script_t *)scriptlist->data); + } +- g_slist_free_full(dle->scriptlist); +- g_slist_free_full(dle->directtcp_list); ++ g_amanda_slist_free_full(dle->scriptlist); ++ g_amanda_slist_free_full(dle->directtcp_list); + amfree(dle); + } + +diff --git a/common-src/conffile.c b/common-src/conffile.c +index 19d87da..c5ea1b8 100644 +--- a/common-src/conffile.c ++++ b/common-src/conffile.c +@@ -4668,7 +4668,7 @@ config_uninit(void) + free_val_t(&hd->value[i]); + } + } +- g_slist_free_full(holdinglist); ++ g_amanda_slist_free_full(holdinglist); + holdinglist = NULL; + + for(dp=dumplist; dp != NULL; dp = dpnext) { +@@ -4754,7 +4754,7 @@ config_uninit(void) + amfree(config_dir); + amfree(config_filename); + +- g_slist_free_full(seen_filenames); ++ g_amanda_slist_free_full(seen_filenames); + seen_filenames = NULL; + + config_client = FALSE; +@@ -5383,7 +5383,7 @@ free_property_t( + gpointer p) + { + property_t *propery = (property_t *)p; +- g_slist_free_full(propery->values); ++ g_amanda_slist_free_full(propery->values); + amfree(propery); + } + +@@ -6508,11 +6508,11 @@ free_val_t( + break; + + case CONFTYPE_IDENTLIST: +- g_slist_free_full(val->v.identlist); ++ g_amanda_slist_free_full(val->v.identlist); + break; + + case CONFTYPE_RECOVERY_LIMIT: +- g_slist_free_full(val->v.recovery_limit.match_pats); ++ g_amanda_slist_free_full(val->v.recovery_limit.match_pats); + break; + + case CONFTYPE_TIME: +@@ -7737,7 +7737,7 @@ config_errors(GSList **errstr) + void + config_clear_errors(void) + { +- g_slist_free_full(cfgerr_errors); ++ g_amanda_slist_free_full(cfgerr_errors); + + cfgerr_errors = NULL; + cfgerr_level = CFGERR_OK; +diff --git a/common-src/glib-util.c b/common-src/glib-util.c +index 38b3990..6c0317c 100644 +--- a/common-src/glib-util.c ++++ b/common-src/glib-util.c +@@ -106,7 +106,7 @@ GValue* g_value_unset_copy(const GValue * from, GValue * to) { + return to; + } + +-void g_list_free_full(GList * list) { ++void g_amanda_list_free_full(GList * list) { + GList * cur = list; + + while (cur != NULL) { +@@ -118,7 +118,7 @@ void g_list_free_full(GList * list) { + g_list_free(list); + } + +-void g_slist_free_full(GSList * list) { ++void g_amanda_slist_free_full(GSList * list) { + GSList * cur = list; + + while (cur != NULL) { +@@ -130,8 +130,8 @@ void g_slist_free_full(GSList * list) { + g_slist_free(list); + } + +-void g_slist_free_full_gpointer(gpointer list) { +- g_slist_free_full((GSList *)list); ++void g_amanda_slist_free_full_gpointer(gpointer list) { ++ g_amanda_slist_free_full((GSList *)list); + } + + void g_queue_free_full(GQueue * queue) { +diff --git a/common-src/glib-util.h b/common-src/glib-util.h +index 01f1331..cf4a9d3 100644 +--- a/common-src/glib-util.h ++++ b/common-src/glib-util.h +@@ -64,9 +64,9 @@ GValue* g_value_unset_copy(const GValue* from, GValue * to); + + /* 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_list_free_full(GList * list); +-void g_slist_free_full(GSList * list); +-void g_slist_free_full_gpointer(gpointer list); ++void g_amanda_list_free_full(GList * list); ++void g_amanda_slist_free_full(GSList * list); ++void g_amanda_slist_free_full_gpointer(gpointer list); + void g_queue_free_full(GQueue * queue); + void g_ptr_array_free_full(GPtrArray * array); + +diff --git a/recover-src/extract_list.c b/recover-src/extract_list.c +index baac507..27823f8 100644 +--- a/recover-src/extract_list.c ++++ b/recover-src/extract_list.c +@@ -2289,7 +2289,7 @@ extract_files(void) + all_level = g_slist_append(all_level, level); + } + if (dump_dle) { +- g_slist_free_full(dump_dle->levellist); ++ g_amanda_slist_free_full(dump_dle->levellist); + dump_dle->levellist = all_level; + run_client_scripts(EXECUTE_ON_PRE_RECOVER, &g_options, dump_dle, + stderr); +@@ -2337,7 +2337,7 @@ extract_files(void) + dump_dle->levellist = g_slist_append(dump_dle->levellist, level); + run_client_scripts(EXECUTE_ON_INTER_LEVEL_RECOVER, &g_options, + dump_dle, stderr); +- g_slist_free_full(dump_dle->levellist); ++ g_amanda_slist_free_full(dump_dle->levellist); + dump_dle->levellist = NULL; + } + +@@ -2373,7 +2373,7 @@ extract_files(void) + if (dump_dle) { + run_client_scripts(EXECUTE_ON_POST_LEVEL_RECOVER, &g_options, + dump_dle, stderr); +- g_slist_free_full(dump_dle->levellist); ++ g_amanda_slist_free_full(dump_dle->levellist); + dump_dle->levellist = NULL; + } + } +@@ -2381,7 +2381,7 @@ extract_files(void) + dump_dle->levellist = all_level; + run_client_scripts(EXECUTE_ON_POST_RECOVER, &g_options, dump_dle, + stderr); +- g_slist_free_full(dump_dle->levellist); ++ g_amanda_slist_free_full(dump_dle->levellist); + all_level = NULL; + dump_dle->levellist = NULL; + } +diff --git a/server-src/amadmin.c b/server-src/amadmin.c +index 96e117b..84a2ea9 100644 +--- a/server-src/amadmin.c ++++ b/server-src/amadmin.c +@@ -1492,7 +1492,7 @@ holding( + amfree(dumpstr); + dumpfile_free_data(&file); + } +- g_slist_free_full(file_list); ++ g_amanda_slist_free_full(file_list); + break; + + case HOLDING_DELETE: +@@ -1510,7 +1510,7 @@ holding( + error(_("Could not delete '%s'"), (char *)li->data); + } + } +- g_slist_free_full(file_list); ++ g_amanda_slist_free_full(file_list); + break; + } + } +diff --git a/server-src/amflush.c b/server-src/amflush.c +index 4d28e44..a18a528 100644 +--- a/server-src/amflush.c ++++ b/server-src/amflush.c +@@ -245,7 +245,7 @@ main( + stralloc((char *)datestamp->data), + g_compare_strings); + } +- g_slist_free_full(all_datestamps); ++ g_amanda_slist_free_full(all_datestamps); + } + else { + /* otherwise, in batch mode, use all datestamps */ +@@ -405,9 +405,9 @@ main( + } + } + +- g_slist_free_full(datestamp_list); ++ g_amanda_slist_free_full(datestamp_list); + datestamp_list = NULL; +- g_slist_free_full(holding_list); ++ g_amanda_slist_free_full(holding_list); + holding_list = NULL; + + if(redirect) { /* rename errfile */ +@@ -599,7 +599,7 @@ pick_datestamp(void) + } + chupper = (char)toupper(ch); + if (chupper < 'A' || chupper > max_char) { +- g_slist_free_full(r_datestamp_list); ++ g_amanda_slist_free_full(r_datestamp_list); + r_datestamp_list = NULL; + break; + } +@@ -607,7 +607,7 @@ pick_datestamp(void) + stralloc(datestamps[chupper - 'A'])); + } while ((ch = *a++) != '\0'); + if (r_datestamp_list && ch == '\0') { +- g_slist_free_full(datestamp_list); ++ g_amanda_slist_free_full(datestamp_list); + datestamp_list = r_datestamp_list; + break; + } +diff --git a/server-src/cmdline.c b/server-src/cmdline.c +index d29a4f3..4d42035 100644 +--- a/server-src/cmdline.c ++++ b/server-src/cmdline.c +@@ -247,7 +247,7 @@ cmdline_match_holding( + dumpfile_free_data(&file); + } + +- g_slist_free_full(holding_files); ++ g_amanda_slist_free_full(holding_files); + + return matching_files; + } +diff --git a/server-src/cmdline.h b/server-src/cmdline.h +index bd62e74..ee8625b 100644 +--- a/server-src/cmdline.h ++++ b/server-src/cmdline.h +@@ -158,7 +158,7 @@ cmdline_format_dumpspec_components( + * the dumpspec list contains a dumpspec with all blank + * entries, all holding files are returned. + * +- * Free the resulting list with g_slist_free_full() ++ * Free the resulting list with g_amanda_slist_free_full() + * + * @param dumpspec_list: a list of dumpspecs + * @returns: a list of holding disk filenames. +diff --git a/server-src/find.c b/server-src/find.c +index dadbd57..8829916 100644 +--- a/server-src/find.c ++++ b/server-src/find.c +@@ -287,7 +287,7 @@ search_holding_disk( + dumpfile_free_data(&file); + } + +- g_slist_free_full(holding_file_list); ++ g_amanda_slist_free_full(holding_file_list); + } + + static int +diff --git a/server-src/holding.c b/server-src/holding.c +index 15286bd..c3d0b85 100644 +--- a/server-src/holding.c ++++ b/server-src/holding.c +@@ -558,7 +558,7 @@ holding_get_files_for_flush( + dumpfile_free_data(&file); + } + +- if (file_list) g_slist_free_full(file_list); ++ if (file_list) g_amanda_slist_free_full(file_list); + + return result_list; + } +@@ -584,7 +584,7 @@ holding_get_all_datestamps(void) + dumpfile_free_data(&dfile); + } + +- g_slist_free_full(all_files); ++ g_amanda_slist_free_full(all_files); + + return datestamps; + } +diff --git a/server-src/planner.c b/server-src/planner.c +index fd18d84..10f8566 100644 +--- a/server-src/planner.c ++++ b/server-src/planner.c +@@ -462,7 +462,7 @@ main( + amfree(qhname); + dumpfile_free_data(&file); + } +- g_slist_free_full(holding_list); ++ g_amanda_slist_free_full(holding_list); + holding_list = NULL; + } + g_fprintf(stderr, _("ENDFLUSH\n")); diff --git a/amanda.spec b/amanda.spec index bc29787..1d734b7 100644 --- a/amanda.spec +++ b/amanda.spec @@ -20,6 +20,7 @@ Patch3: amanda-3.1.1-tcpport.patch Patch4: amanda-3.1.0-ftbfs.patch Patch5: amanda-3.1.1-bsd.patch Patch6: amanda-3.2.0-config-dir.patch +Patch7: amanda-3.2.0-glib.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -86,6 +87,7 @@ server also needs to have the amanda-client package installed. %patch4 -p1 -b .ftbfs %patch5 -p1 -b .bsd %patch6 -p1 -b .config +%patch7 -p1 -b .glib ./autogen %build @@ -419,6 +421,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * 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 From b6b018ae62f593b9f97239a0e43a0891a6b2872c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Wed, 15 Dec 2010 15:30:59 +0100 Subject: [PATCH 015/182] upgrade to new upstream release --- .gitignore | 1 + amanda-3.1.0-ftbfs.patch | 12 -- amanda-3.2.0-glib.patch | 320 --------------------------------------- amanda.spec | 10 +- sources | 2 +- 5 files changed, 7 insertions(+), 338 deletions(-) delete mode 100644 amanda-3.1.0-ftbfs.patch delete mode 100644 amanda-3.2.0-glib.patch diff --git a/.gitignore b/.gitignore index e451a5f..66b8b8e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ amanda-3.1.1.tar.gz /amanda-3.1.2.tar.gz /amanda-3.1.3.tar.gz /amanda-3.2.0.tar.gz +/amanda-3.2.1.tar.gz diff --git a/amanda-3.1.0-ftbfs.patch b/amanda-3.1.0-ftbfs.patch deleted file mode 100644 index 505e44b..0000000 --- a/amanda-3.1.0-ftbfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up amanda-3.1.0/common-src/glib-util.c.ftbfs amanda-3.1.0/common-src/glib-util.c ---- amanda-3.1.0/common-src/glib-util.c.ftbfs 2010-06-01 21:22:19.000000000 +0200 -+++ amanda-3.1.0/common-src/glib-util.c 2010-06-23 17:34:18.580848540 +0200 -@@ -42,7 +42,7 @@ glib_init(void) { - * is initialized) */ - #ifdef HAVE_LIBCURL - # ifdef G_THREADS_ENABLED -- g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ -+ /*g_assert(!g_thread_supported());*/ /* assert threads aren't initialized yet */ - # endif - g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); - #endif diff --git a/amanda-3.2.0-glib.patch b/amanda-3.2.0-glib.patch deleted file mode 100644 index b3f5519..0000000 --- a/amanda-3.2.0-glib.patch +++ /dev/null @@ -1,320 +0,0 @@ -diff --git a/client-src/client_util.c b/client-src/client_util.c -index 5dc4974..051a317 100644 ---- a/client-src/client_util.c -+++ b/client-src/client_util.c -@@ -1009,7 +1009,7 @@ run_client_script( - script->result = g_new0(client_script_result_t, 1); - script->result->proplist = - g_hash_table_new_full(g_str_hash, g_str_equal, -- &g_free, &g_slist_free_full_gpointer); -+ &g_free, &g_amanda_slist_free_full_gpointer); - script->result->output = g_ptr_array_new(); - script->result->err = g_ptr_array_new(); - -diff --git a/common-src/amxml.c b/common-src/amxml.c -index fedf5cc..8fa0d2b 100644 ---- a/common-src/amxml.c -+++ b/common-src/amxml.c -@@ -86,7 +86,7 @@ free_dle( - amfree(dle->device); - amfree(dle->program); - g_slist_free(dle->estimatelist); -- g_slist_free_full(dle->levellist); -+ g_amanda_slist_free_full(dle->levellist); - amfree(dle->dumpdate); - amfree(dle->compprog); - amfree(dle->srv_encrypt); -@@ -104,8 +104,8 @@ free_dle( - scriptlist = scriptlist->next) { - free_script_data((script_t *)scriptlist->data); - } -- g_slist_free_full(dle->scriptlist); -- g_slist_free_full(dle->directtcp_list); -+ g_amanda_slist_free_full(dle->scriptlist); -+ g_amanda_slist_free_full(dle->directtcp_list); - amfree(dle); - } - -diff --git a/common-src/conffile.c b/common-src/conffile.c -index 19d87da..c5ea1b8 100644 ---- a/common-src/conffile.c -+++ b/common-src/conffile.c -@@ -4668,7 +4668,7 @@ config_uninit(void) - free_val_t(&hd->value[i]); - } - } -- g_slist_free_full(holdinglist); -+ g_amanda_slist_free_full(holdinglist); - holdinglist = NULL; - - for(dp=dumplist; dp != NULL; dp = dpnext) { -@@ -4754,7 +4754,7 @@ config_uninit(void) - amfree(config_dir); - amfree(config_filename); - -- g_slist_free_full(seen_filenames); -+ g_amanda_slist_free_full(seen_filenames); - seen_filenames = NULL; - - config_client = FALSE; -@@ -5383,7 +5383,7 @@ free_property_t( - gpointer p) - { - property_t *propery = (property_t *)p; -- g_slist_free_full(propery->values); -+ g_amanda_slist_free_full(propery->values); - amfree(propery); - } - -@@ -6508,11 +6508,11 @@ free_val_t( - break; - - case CONFTYPE_IDENTLIST: -- g_slist_free_full(val->v.identlist); -+ g_amanda_slist_free_full(val->v.identlist); - break; - - case CONFTYPE_RECOVERY_LIMIT: -- g_slist_free_full(val->v.recovery_limit.match_pats); -+ g_amanda_slist_free_full(val->v.recovery_limit.match_pats); - break; - - case CONFTYPE_TIME: -@@ -7737,7 +7737,7 @@ config_errors(GSList **errstr) - void - config_clear_errors(void) - { -- g_slist_free_full(cfgerr_errors); -+ g_amanda_slist_free_full(cfgerr_errors); - - cfgerr_errors = NULL; - cfgerr_level = CFGERR_OK; -diff --git a/common-src/glib-util.c b/common-src/glib-util.c -index 38b3990..6c0317c 100644 ---- a/common-src/glib-util.c -+++ b/common-src/glib-util.c -@@ -106,7 +106,7 @@ GValue* g_value_unset_copy(const GValue * from, GValue * to) { - return to; - } - --void g_list_free_full(GList * list) { -+void g_amanda_list_free_full(GList * list) { - GList * cur = list; - - while (cur != NULL) { -@@ -118,7 +118,7 @@ void g_list_free_full(GList * list) { - g_list_free(list); - } - --void g_slist_free_full(GSList * list) { -+void g_amanda_slist_free_full(GSList * list) { - GSList * cur = list; - - while (cur != NULL) { -@@ -130,8 +130,8 @@ void g_slist_free_full(GSList * list) { - g_slist_free(list); - } - --void g_slist_free_full_gpointer(gpointer list) { -- g_slist_free_full((GSList *)list); -+void g_amanda_slist_free_full_gpointer(gpointer list) { -+ g_amanda_slist_free_full((GSList *)list); - } - - void g_queue_free_full(GQueue * queue) { -diff --git a/common-src/glib-util.h b/common-src/glib-util.h -index 01f1331..cf4a9d3 100644 ---- a/common-src/glib-util.h -+++ b/common-src/glib-util.h -@@ -64,9 +64,9 @@ GValue* g_value_unset_copy(const GValue* from, GValue * to); - - /* 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_list_free_full(GList * list); --void g_slist_free_full(GSList * list); --void g_slist_free_full_gpointer(gpointer list); -+void g_amanda_list_free_full(GList * list); -+void g_amanda_slist_free_full(GSList * list); -+void g_amanda_slist_free_full_gpointer(gpointer list); - void g_queue_free_full(GQueue * queue); - void g_ptr_array_free_full(GPtrArray * array); - -diff --git a/recover-src/extract_list.c b/recover-src/extract_list.c -index baac507..27823f8 100644 ---- a/recover-src/extract_list.c -+++ b/recover-src/extract_list.c -@@ -2289,7 +2289,7 @@ extract_files(void) - all_level = g_slist_append(all_level, level); - } - if (dump_dle) { -- g_slist_free_full(dump_dle->levellist); -+ g_amanda_slist_free_full(dump_dle->levellist); - dump_dle->levellist = all_level; - run_client_scripts(EXECUTE_ON_PRE_RECOVER, &g_options, dump_dle, - stderr); -@@ -2337,7 +2337,7 @@ extract_files(void) - dump_dle->levellist = g_slist_append(dump_dle->levellist, level); - run_client_scripts(EXECUTE_ON_INTER_LEVEL_RECOVER, &g_options, - dump_dle, stderr); -- g_slist_free_full(dump_dle->levellist); -+ g_amanda_slist_free_full(dump_dle->levellist); - dump_dle->levellist = NULL; - } - -@@ -2373,7 +2373,7 @@ extract_files(void) - if (dump_dle) { - run_client_scripts(EXECUTE_ON_POST_LEVEL_RECOVER, &g_options, - dump_dle, stderr); -- g_slist_free_full(dump_dle->levellist); -+ g_amanda_slist_free_full(dump_dle->levellist); - dump_dle->levellist = NULL; - } - } -@@ -2381,7 +2381,7 @@ extract_files(void) - dump_dle->levellist = all_level; - run_client_scripts(EXECUTE_ON_POST_RECOVER, &g_options, dump_dle, - stderr); -- g_slist_free_full(dump_dle->levellist); -+ g_amanda_slist_free_full(dump_dle->levellist); - all_level = NULL; - dump_dle->levellist = NULL; - } -diff --git a/server-src/amadmin.c b/server-src/amadmin.c -index 96e117b..84a2ea9 100644 ---- a/server-src/amadmin.c -+++ b/server-src/amadmin.c -@@ -1492,7 +1492,7 @@ holding( - amfree(dumpstr); - dumpfile_free_data(&file); - } -- g_slist_free_full(file_list); -+ g_amanda_slist_free_full(file_list); - break; - - case HOLDING_DELETE: -@@ -1510,7 +1510,7 @@ holding( - error(_("Could not delete '%s'"), (char *)li->data); - } - } -- g_slist_free_full(file_list); -+ g_amanda_slist_free_full(file_list); - break; - } - } -diff --git a/server-src/amflush.c b/server-src/amflush.c -index 4d28e44..a18a528 100644 ---- a/server-src/amflush.c -+++ b/server-src/amflush.c -@@ -245,7 +245,7 @@ main( - stralloc((char *)datestamp->data), - g_compare_strings); - } -- g_slist_free_full(all_datestamps); -+ g_amanda_slist_free_full(all_datestamps); - } - else { - /* otherwise, in batch mode, use all datestamps */ -@@ -405,9 +405,9 @@ main( - } - } - -- g_slist_free_full(datestamp_list); -+ g_amanda_slist_free_full(datestamp_list); - datestamp_list = NULL; -- g_slist_free_full(holding_list); -+ g_amanda_slist_free_full(holding_list); - holding_list = NULL; - - if(redirect) { /* rename errfile */ -@@ -599,7 +599,7 @@ pick_datestamp(void) - } - chupper = (char)toupper(ch); - if (chupper < 'A' || chupper > max_char) { -- g_slist_free_full(r_datestamp_list); -+ g_amanda_slist_free_full(r_datestamp_list); - r_datestamp_list = NULL; - break; - } -@@ -607,7 +607,7 @@ pick_datestamp(void) - stralloc(datestamps[chupper - 'A'])); - } while ((ch = *a++) != '\0'); - if (r_datestamp_list && ch == '\0') { -- g_slist_free_full(datestamp_list); -+ g_amanda_slist_free_full(datestamp_list); - datestamp_list = r_datestamp_list; - break; - } -diff --git a/server-src/cmdline.c b/server-src/cmdline.c -index d29a4f3..4d42035 100644 ---- a/server-src/cmdline.c -+++ b/server-src/cmdline.c -@@ -247,7 +247,7 @@ cmdline_match_holding( - dumpfile_free_data(&file); - } - -- g_slist_free_full(holding_files); -+ g_amanda_slist_free_full(holding_files); - - return matching_files; - } -diff --git a/server-src/cmdline.h b/server-src/cmdline.h -index bd62e74..ee8625b 100644 ---- a/server-src/cmdline.h -+++ b/server-src/cmdline.h -@@ -158,7 +158,7 @@ cmdline_format_dumpspec_components( - * the dumpspec list contains a dumpspec with all blank - * entries, all holding files are returned. - * -- * Free the resulting list with g_slist_free_full() -+ * Free the resulting list with g_amanda_slist_free_full() - * - * @param dumpspec_list: a list of dumpspecs - * @returns: a list of holding disk filenames. -diff --git a/server-src/find.c b/server-src/find.c -index dadbd57..8829916 100644 ---- a/server-src/find.c -+++ b/server-src/find.c -@@ -287,7 +287,7 @@ search_holding_disk( - dumpfile_free_data(&file); - } - -- g_slist_free_full(holding_file_list); -+ g_amanda_slist_free_full(holding_file_list); - } - - static int -diff --git a/server-src/holding.c b/server-src/holding.c -index 15286bd..c3d0b85 100644 ---- a/server-src/holding.c -+++ b/server-src/holding.c -@@ -558,7 +558,7 @@ holding_get_files_for_flush( - dumpfile_free_data(&file); - } - -- if (file_list) g_slist_free_full(file_list); -+ if (file_list) g_amanda_slist_free_full(file_list); - - return result_list; - } -@@ -584,7 +584,7 @@ holding_get_all_datestamps(void) - dumpfile_free_data(&dfile); - } - -- g_slist_free_full(all_files); -+ g_amanda_slist_free_full(all_files); - - return datestamps; - } -diff --git a/server-src/planner.c b/server-src/planner.c -index fd18d84..10f8566 100644 ---- a/server-src/planner.c -+++ b/server-src/planner.c -@@ -462,7 +462,7 @@ main( - amfree(qhname); - dumpfile_free_data(&file); - } -- g_slist_free_full(holding_list); -+ g_amanda_slist_free_full(holding_list); - holding_list = NULL; - } - g_fprintf(stderr, _("ENDFLUSH\n")); diff --git a/amanda.spec b/amanda.spec index 1d734b7..c8bf173 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,7 +7,7 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab @@ -17,10 +17,8 @@ Source8: amandahosts Patch1: amanda-3.1.0-example.patch Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch -Patch4: amanda-3.1.0-ftbfs.patch Patch5: amanda-3.1.1-bsd.patch Patch6: amanda-3.2.0-config-dir.patch -Patch7: amanda-3.2.0-glib.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -84,10 +82,8 @@ server also needs to have the amanda-client package installed. %patch1 -p1 -b .example %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport -%patch4 -p1 -b .ftbfs %patch5 -p1 -b .bsd %patch6 -p1 -b .config -%patch7 -p1 -b .glib ./autogen %build @@ -419,6 +415,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/sources b/sources index c020967..a365c82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df73a318af8f04e9ad2ecb4d59dc052c amanda-3.2.0.tar.gz +52448420a04d27b8ce47ef397b0a7061 amanda-3.2.1.tar.gz From 15b1474726d8e39e19bd39edb7e431dd3873c6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Mon, 31 Jan 2011 11:30:36 +0100 Subject: [PATCH 016/182] fix #666968 - amrestore should restore one file when outputting to a pipe --- amanda-3.1-amrestore.patch | 23 +++++++++++++++++++++++ amanda.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 amanda-3.1-amrestore.patch diff --git a/amanda-3.1-amrestore.patch b/amanda-3.1-amrestore.patch new file mode 100644 index 0000000..5bea107 --- /dev/null +++ b/amanda-3.1-amrestore.patch @@ -0,0 +1,23 @@ +diff --git a/server-src/amrestore.pl b/server-src/amrestore.pl +index dfe521a..d3284ed 100755 +--- a/server-src/amrestore.pl ++++ b/server-src/amrestore.pl +@@ -372,13 +372,14 @@ sub main { + my ($err) = @_; + return failure($err, $finished_cb) if $err; + +- $steps->{'next_file'}->(); ++ $steps->{'next_file'}->('extracted'); + }; + + step next_file => sub { +- # amrestore does not loop over multiple files when reading from +- # holding or when outputting to a pipe +- if ($opt_holding or $opt_pipe) { ++ my ($extracted) = @_; ++ # amrestore does not loop over multiple files when reading from holding ++ # when outputting to a pipe amrestore extracts only the first file ++ if ($opt_holding or ($opt_pipe and $extracted)) { + return $steps->{'finished'}->(); + } + diff --git a/amanda.spec b/amanda.spec index c8bf173..aa1ce82 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -19,6 +19,7 @@ Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch5: amanda-3.1.1-bsd.patch Patch6: amanda-3.2.0-config-dir.patch +Patch7: amanda-3.1-amrestore.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -84,6 +85,7 @@ server also needs to have the amanda-client package installed. %patch3 -p1 -b .tcpport %patch5 -p1 -b .bsd %patch6 -p1 -b .config +%patch7 -p1 -b .amrestore ./autogen %build @@ -415,6 +417,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 785a32d8f2afab995b001c3b48d3e6d80e967e43 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:03:27 -0600 Subject: [PATCH 017/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index aa1ce82..1b1f3a8 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -417,6 +417,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From e3cc2425ac2c709e15237161a54b62b590f30e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Wed, 16 Mar 2011 12:02:32 +0100 Subject: [PATCH 018/182] - upgrade to new upstream release - removed merged patch amanda-3.1-amrestore.patch - fixed build on system with amanda installed --- .gitignore | 1 + amanda-3.1-amrestore.patch | 23 ----------------------- amanda-3.2.2-krb5-libs.patch | 16 ++++++++++++++++ amanda.spec | 13 +++++++++---- sources | 2 +- 5 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 amanda-3.1-amrestore.patch create mode 100644 amanda-3.2.2-krb5-libs.patch diff --git a/.gitignore b/.gitignore index 66b8b8e..9fe694f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ amanda-3.1.1.tar.gz /amanda-3.1.3.tar.gz /amanda-3.2.0.tar.gz /amanda-3.2.1.tar.gz +/amanda-3.2.2.tar.gz diff --git a/amanda-3.1-amrestore.patch b/amanda-3.1-amrestore.patch deleted file mode 100644 index 5bea107..0000000 --- a/amanda-3.1-amrestore.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/server-src/amrestore.pl b/server-src/amrestore.pl -index dfe521a..d3284ed 100755 ---- a/server-src/amrestore.pl -+++ b/server-src/amrestore.pl -@@ -372,13 +372,14 @@ sub main { - my ($err) = @_; - return failure($err, $finished_cb) if $err; - -- $steps->{'next_file'}->(); -+ $steps->{'next_file'}->('extracted'); - }; - - step next_file => sub { -- # amrestore does not loop over multiple files when reading from -- # holding or when outputting to a pipe -- if ($opt_holding or $opt_pipe) { -+ my ($extracted) = @_; -+ # amrestore does not loop over multiple files when reading from holding -+ # when outputting to a pipe amrestore extracts only the first file -+ if ($opt_holding or ($opt_pipe and $extracted)) { - return $steps->{'finished'}->(); - } - diff --git a/amanda-3.2.2-krb5-libs.patch b/amanda-3.2.2-krb5-libs.patch new file mode 100644 index 0000000..a525d50 --- /dev/null +++ b/amanda-3.2.2-krb5-libs.patch @@ -0,0 +1,16 @@ +diff --git a/config/amanda/krb5-security.m4 b/config/amanda/krb5-security.m4 +index 0aea8f5..9c8cf30 100644 +--- a/config/amanda/krb5-security.m4 ++++ b/config/amanda/krb5-security.m4 +@@ -82,7 +82,10 @@ AC_DEFUN([AMANDA_KRB5_SECURITY], + AMANDA_ADD_CPPFLAGS([-I$KRB5_DIR_FOUND/include]) + fi + AC_CHECK_LIB(krb5support,main) +- AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND]) ++ ++ if test "$KRB5_LIBDIR_FOUND" != "$libdir" ; then ++ AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND]) ++ fi + + AC_DEFINE(KRB5_SECURITY,1, + [Define if Kerberos 5 security is to be enabled. ]) diff --git a/amanda.spec b/amanda.spec index 1b1f3a8..84b05cd 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,8 +7,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -19,7 +19,7 @@ Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch5: amanda-3.1.1-bsd.patch Patch6: amanda-3.2.0-config-dir.patch -Patch7: amanda-3.1-amrestore.patch +Patch7: amanda-3.2.2-krb5-libs.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -85,7 +85,7 @@ server also needs to have the amanda-client package installed. %patch3 -p1 -b .tcpport %patch5 -p1 -b .bsd %patch6 -p1 -b .config -%patch7 -p1 -b .amrestore +%patch7 -p1 -b .libs ./autogen %build @@ -417,6 +417,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/sources b/sources index a365c82..5820ea0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52448420a04d27b8ce47ef397b0a7061 amanda-3.2.1.tar.gz +4d5a5efcdcf01947a89323cd62d8fb6e amanda-3.2.2.tar.gz From 4a39478e08e3ede8412dd347701621f4702163f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Wed, 27 Apr 2011 12:05:33 +0200 Subject: [PATCH 019/182] amgtar, amstar and amservice must have setuid flag (#697933) --- amanda.spec | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/amanda.spec b/amanda.spec index 84b05cd..97e5fb3 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -305,7 +305,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/amrestore %{_sbindir}/amrmtape %{_sbindir}/amserverconfig -%{_sbindir}/amservice +%attr(4750,root,%amanda_group) %{_sbindir}/amservice %{_sbindir}/amstatus %{_sbindir}/amtape %{_sbindir}/amtapetype @@ -378,7 +378,19 @@ rm -rf ${RPM_BUILD_ROOT} %files client %defattr(-,root,root) %{_libdir}/libamclient*.so -%{_libexecdir}/amanda/application/ + +%dir %{_libexecdir}/amanda/application/ +%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 + %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp %{_libexecdir}/amanda/noop @@ -417,6 +429,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From b1031e68652fa098f3774af9d0de3fdad007a08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Wed, 4 May 2011 12:00:39 +0200 Subject: [PATCH 020/182] update to new upstream beta release --- .gitignore | 1 + amanda-3.2.2-krb5-libs.patch | 16 ---------------- amanda.spec | 25 +++++++++++++++++-------- sources | 2 +- 4 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 amanda-3.2.2-krb5-libs.patch diff --git a/.gitignore b/.gitignore index 9fe694f..83a7e5a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ amanda-3.1.1.tar.gz /amanda-3.2.0.tar.gz /amanda-3.2.1.tar.gz /amanda-3.2.2.tar.gz +/amanda-3.3.0beta1.tar.gz diff --git a/amanda-3.2.2-krb5-libs.patch b/amanda-3.2.2-krb5-libs.patch deleted file mode 100644 index a525d50..0000000 --- a/amanda-3.2.2-krb5-libs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/config/amanda/krb5-security.m4 b/config/amanda/krb5-security.m4 -index 0aea8f5..9c8cf30 100644 ---- a/config/amanda/krb5-security.m4 -+++ b/config/amanda/krb5-security.m4 -@@ -82,7 +82,10 @@ AC_DEFUN([AMANDA_KRB5_SECURITY], - AMANDA_ADD_CPPFLAGS([-I$KRB5_DIR_FOUND/include]) - fi - AC_CHECK_LIB(krb5support,main) -- AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND]) -+ -+ if test "$KRB5_LIBDIR_FOUND" != "$libdir" ; then -+ AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND]) -+ fi - - AC_DEFINE(KRB5_SECURITY,1, - [Define if Kerberos 5 security is to be enabled. ]) diff --git a/amanda.spec b/amanda.spec index 97e5fb3..0a52516 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,9 +7,10 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.2.2 -Release: 2%{?dist} -Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz +Version: 3.3.0 +Release: 0.1.beta1%{?dist} +#Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz +Source: http://downloads.sourceforge.net/amanda/amanda-3.3.0beta1.tar.gz Source1: amanda.crontab Source4: disklist Source5: amanda-xinetd @@ -19,7 +20,6 @@ Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch5: amanda-3.1.1-bsd.patch Patch6: amanda-3.2.0-config-dir.patch -Patch7: amanda-3.2.2-krb5-libs.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -79,13 +79,13 @@ 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. %prep -%setup -q -n %{name}-%{version} +#%%setup -q -n %%{name}-%%{version} +%setup -q -n %{name}-3.3.0beta1 %patch1 -p1 -b .example %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch5 -p1 -b .bsd %patch6 -p1 -b .config -%patch7 -p1 -b .libs ./autogen %build @@ -272,6 +272,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libamdevice*.so %{_libdir}/libamserver*.so %{_libexecdir}/amanda/amcleanupdisk +%{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amcheck-device %{_libexecdir}/amanda/amidxtaped %{_libexecdir}/amanda/amindexd @@ -316,6 +317,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man5/tapelist.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* @@ -349,12 +351,13 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Holding.pm %{perl_vendorarch}/Amanda/Changer/ %{perl_vendorarch}/Amanda/Changer.pm -%{perl_vendorarch}/Amanda/Interactive/ -%{perl_vendorarch}/Amanda/Interactive.pm +%{perl_vendorarch}/Amanda/Interactivity/ +%{perl_vendorarch}/Amanda/Interactivity.pm %{perl_vendorarch}/Amanda/Logfile.pm %{perl_vendorarch}/Amanda/Recovery/ %{perl_vendorarch}/Amanda/Report/ %{perl_vendorarch}/Amanda/Report.pm +%{perl_vendorarch}/Amanda/ScanInventory.pm %{perl_vendorarch}/Amanda/Tapelist.pm %{perl_vendorarch}/Amanda/Taper/ %{perl_vendorarch}/Amanda/XferServer.pm @@ -401,10 +404,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_libexecdir}/amanda/sendbackup %{_libexecdir}/amanda/sendsize %{_libexecdir}/amanda/teecount +%{_sbindir}/amdump_client %{_sbindir}/amoldrecover %{_sbindir}/amrecover %{_mandir}/man7/amanda-applications.7* +%{_mandir}/man8/amdump_client.8* %{_mandir}/man5/amanda-client.conf.5* %{_mandir}/man8/amgtar.8* %{_mandir}/man8/ampgsql.8* @@ -429,6 +434,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) diff --git a/sources b/sources index 5820ea0..99674c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d5a5efcdcf01947a89323cd62d8fb6e amanda-3.2.2.tar.gz +ce14292d4f84448b3d87c3b475082d65 amanda-3.3.0beta1.tar.gz From 8f856a91cd251f308210c18c9c7d8f6a15929d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Wed, 8 Jun 2011 13:13:02 +0200 Subject: [PATCH 021/182] - upgrade to new upstream release - uses bsdtcp authentication by default - dropped amanda-3.1.1-bsd.patch --- .gitignore | 1 + amanda-3.1.1-bsd.patch | 28 ---------------------------- amanda-xinetd | 10 ++++++---- amanda.spec | 15 ++++++++------- sources | 2 +- 5 files changed, 16 insertions(+), 40 deletions(-) delete mode 100644 amanda-3.1.1-bsd.patch diff --git a/.gitignore b/.gitignore index 83a7e5a..c32f3d3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ amanda-3.1.1.tar.gz /amanda-3.2.1.tar.gz /amanda-3.2.2.tar.gz /amanda-3.3.0beta1.tar.gz +/amanda-3.3.0.tar.gz diff --git a/amanda-3.1.1-bsd.patch b/amanda-3.1.1-bsd.patch deleted file mode 100644 index dc65d94..0000000 --- a/amanda-3.1.1-bsd.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up amanda-3.1.1/example/amanda-client.conf.in.bsd amanda-3.1.1/example/amanda-client.conf.in ---- amanda-3.1.1/example/amanda-client.conf.in.bsd 2010-08-10 12:26:03.000000000 +0200 -+++ amanda-3.1.1/example/amanda-client.conf.in 2010-08-10 14:37:54.027754862 +0200 -@@ -17,8 +17,8 @@ tapedev "@EXAMPLE_TAPEDEV@" # your - # auth - authentication scheme to use between server and client. - # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local", - # "rsh" and "ssh". --# Default: [auth "bsdtcp"] --auth "bsdtcp" -+# Default: [auth "bsd"] -+auth "bsd" - - ssh_keys "" # your ssh keys file if you use ssh auth - -diff -up amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd amanda-3.1.1/example/amanda-client-postgresql.conf.in ---- amanda-3.1.1/example/amanda-client-postgresql.conf.in.bsd 2010-06-29 19:09:55.000000000 +0200 -+++ amanda-3.1.1/example/amanda-client-postgresql.conf.in 2010-08-10 14:38:00.522754862 +0200 -@@ -16,8 +16,8 @@ tape_server "@DEFAULT_TAPE_SERVER@" # y - # auth - authentication scheme to use between server and client. - # Valid values are "bsd", "bsdudp", "bsdtcp", "krb5", "local", - # "rsh" and "ssh". --# Default: [auth "bsdtcp"] --auth "bsdtcp" -+# Default: [auth "bsd"] -+auth "bsd" - - # your ssh keys file if you use ssh auth - ssh_keys "/var/lib/amanda/.ssh/id_rsa_amrecover" diff --git a/amanda-xinetd b/amanda-xinetd index 0c6a256..ec084ae 100644 --- a/amanda-xinetd +++ b/amanda-xinetd @@ -5,11 +5,13 @@ service amanda { - socket_type = dgram - protocol = udp - wait = yes + flags = IPv4 + socket_type = stream + protocol = tcp + wait = no user = amandabackup group = disk + groups = yes server = /usr/sbin/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 @@ -18,6 +20,6 @@ service amanda # 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 + server_args = -auth=bsdtcp amdump disable = yes } diff --git a/amanda.spec b/amanda.spec index 0a52516..09d52d9 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,9 +8,8 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 0.1.beta1%{?dist} -#Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz -Source: http://downloads.sourceforge.net/amanda/amanda-3.3.0beta1.tar.gz +Release: 1%{?dist} +Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist Source5: amanda-xinetd @@ -18,7 +17,6 @@ Source8: amandahosts Patch1: amanda-3.1.0-example.patch Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch -Patch5: amanda-3.1.1-bsd.patch Patch6: amanda-3.2.0-config-dir.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -79,12 +77,10 @@ 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. %prep -#%%setup -q -n %%{name}-%%{version} -%setup -q -n %{name}-3.3.0beta1 +%setup -q -n %{name}-%{version} %patch1 -p1 -b .example %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport -%patch5 -p1 -b .bsd %patch6 -p1 -b .config ./autogen @@ -434,6 +430,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 + * 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 diff --git a/sources b/sources index 99674c2..d173bd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce14292d4f84448b3d87c3b475082d65 amanda-3.3.0beta1.tar.gz +e206f42fb523c6bfe728b03665d4e277 amanda-3.3.0.tar.gz From 0b137531ec19e70fed5a55af700586c9a8d8e47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B6rig?= Date: Wed, 8 Jun 2011 14:36:30 +0200 Subject: [PATCH 022/182] modified example directory handling and dropped amanda-3.1.0-example.patch --- amanda-3.1.0-example.patch | 16 ---------------- amanda.spec | 6 +++--- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 amanda-3.1.0-example.patch diff --git a/amanda-3.1.0-example.patch b/amanda-3.1.0-example.patch deleted file mode 100644 index ee9ea2c..0000000 --- a/amanda-3.1.0-example.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up amanda-3.1.0/example/Makefile.am.example amanda-3.1.0/example/Makefile.am ---- amanda-3.1.0/example/Makefile.am.example 2010-06-01 21:21:59.000000000 +0200 -+++ amanda-3.1.0/example/Makefile.am 2010-06-23 15:53:42.693848261 +0200 -@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va - - amanda_dir = $(amdatadir) - templatedir = $(amanda_dir)/template.d --server_exampledir = $(amanda_dir)/example --client_exampledir = $(amanda_dir)/example --lbltempldir = $(amanda_dir)/example/label-templates -+server_exampledir = $(sysconfdir)/amanda/example -+client_exampledir = $(sysconfdir)/amanda/example -+lbltempldir = $(sysconfdir)/amanda/example/label-templates - - template_in_FILE = \ - template.d/advanced.conf.in \ diff --git a/amanda.spec b/amanda.spec index 09d52d9..04bb4f7 100644 --- a/amanda.spec +++ b/amanda.spec @@ -14,7 +14,6 @@ Source1: amanda.crontab Source4: disklist Source5: amanda-xinetd Source8: amandahosts -Patch1: amanda-3.1.0-example.patch Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch @@ -78,7 +77,6 @@ server also needs to have the amanda-client package installed. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -b .example %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch6 -p1 -b .config @@ -120,6 +118,7 @@ rm -rf ${RPM_BUILD_ROOT} make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc/amanda mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d cp %SOURCE5 $RPM_BUILD_ROOT/etc/xinetd.d/amanda chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amanda @@ -131,7 +130,7 @@ 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 @@ -434,6 +433,7 @@ rm -rf ${RPM_BUILD_ROOT} - 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 From 15d52a35c259d8b9274d96fe511b130c6cd33fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Thu, 16 Jun 2011 13:33:37 +0200 Subject: [PATCH 023/182] Perl mass rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 04bb4f7..f124cbd 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -429,6 +429,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 6c8bd6cb505e2d6cecc18440ec6a8399ce318027 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 28 Nov 2011 11:44:20 +0100 Subject: [PATCH 024/182] Fix for error "Use of qw(...) as parentheses is deprecated" --- amanda-3.3.0-qw.patch | 106 ++++++++++++++++++++++++++++++++++++++++++ amanda.spec | 7 ++- 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 amanda-3.3.0-qw.patch diff --git a/amanda-3.3.0-qw.patch b/amanda-3.3.0-qw.patch new file mode 100644 index 0000000..2eb0a84 --- /dev/null +++ b/amanda-3.3.0-qw.patch @@ -0,0 +1,106 @@ +Index: amanda/branches/3_3/perl/Amanda/Changer/robot.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Changer/robot.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Changer/robot.pm (revision 4172) +@@ -266,7 +266,7 @@ + } + + # status-interval, eject-delay, unload-delay +- for my $propname qw(status-interval eject-delay unload-delay) { ++ for my $propname (qw(status-interval eject-delay unload-delay)) { + next unless exists $config->{'properties'}->{$propname}; + if (@{$config->{'properties'}->{$propname}->{'values'}} > 1) { + return Amanda::Changer->make_error("fatal", undef, +Index: amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm (revision 4172) +@@ -228,7 +228,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(changer plan_cb dumpspecs) { ++ for my $rq_param (qw(changer plan_cb dumpspecs)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +@@ -339,7 +339,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(holding_file plan_cb) { ++ for my $rq_param (qw(holding_file plan_cb)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +@@ -390,7 +390,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(filelist plan_cb) { ++ for my $rq_param (qw(filelist plan_cb)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +Index: amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm (revision 4172) +@@ -228,7 +228,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(dump xfer_src_cb) { ++ for my $rq_param (qw(dump xfer_src_cb)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +@@ -262,7 +262,7 @@ + my %params = @_; + + $self->dbg("starting recovery"); +- for my $rq_param qw(xfer recovery_cb) { ++ for my $rq_param (qw(xfer recovery_cb)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +Index: amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm (revision 4171) ++++ amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm (revision 4172) +@@ -442,7 +442,7 @@ + my %params = @_; + + my $decide_debug = $Amanda::Config::debug_taper || $params{'debug'}; +- for my $rq_param qw(taperscan feedback) { ++ for my $rq_param (qw(taperscan feedback)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } +@@ -491,7 +491,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(write_timestamp finished_cb) { ++ for my $rq_param (qw(write_timestamp finished_cb)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +@@ -615,7 +615,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(max_memory) { ++ for my $rq_param (qw(max_memory)) { + croak "required parameter '$rq_param' missing" + unless exists $params{$rq_param}; + } +@@ -1622,7 +1622,7 @@ + my $self = shift; + my %params = @_; + +- for my $rq_param qw(finished_cb) { ++ for my $rq_param (qw(finished_cb)) { + croak "required parameter '$rq_param' mising" + unless exists $params{$rq_param}; + } diff --git a/amanda.spec b/amanda.spec index f124cbd..935eb62 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -17,6 +17,7 @@ Source8: amandahosts Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch +Patch7: amanda-3.3.0-qw.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -80,6 +81,7 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch6 -p1 -b .config +%patch7 -p3 -b .qw ./autogen %build @@ -429,6 +431,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Nov 28 2011 Lukáš Nykrýn - 3.3.0-3 +- fix #757618 - Use of qw(...) as parentheses is deprecated + * Thu Jun 16 2011 Marcela Mašláňová - 3.3.0-2 - Perl mass rebuild From 0fa0b18eab8490274de7a042d8533bd9882f1ef0 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 28 Nov 2011 11:47:15 +0100 Subject: [PATCH 025/182] Amanda client was using perl functions provided by server --- amanda-3.3.0-match_disk.patch | 189 ++++++++++++++++++++++++++++++++++ amanda.spec | 3 + 2 files changed, 192 insertions(+) create mode 100644 amanda-3.3.0-match_disk.patch diff --git a/amanda-3.3.0-match_disk.patch b/amanda-3.3.0-match_disk.patch new file mode 100644 index 0000000..b354d34 --- /dev/null +++ b/amanda-3.3.0-match_disk.patch @@ -0,0 +1,189 @@ +Index: amanda/branches/3_3/client-src/amdump_client.pl +=================================================================== +--- amanda/branches/3_3/client-src/amdump_client.pl (revision 4389) ++++ amanda/branches/3_3/client-src/amdump_client.pl (revision 4390) +@@ -28,7 +28,7 @@ + use Amanda::Util qw( :constants ); + use Amanda::Config qw( :init :getconf ); + use Amanda::Paths; +-use Amanda::Logfile qw( log_rename get_current_log_timestamp $amanda_log_trace_log ); ++use Amanda::Util qw ( match_disk ); + use Amanda::Debug qw( debug ); + + Amanda::Util::setup_application("amdump_client", "client", $CONTEXT_CMDLINE); +@@ -95,7 +95,7 @@ + #find the diskname that match + for (my $i=1; $i <= $#ARGV; $i++) { + for my $diskname (@disks) { +- if (Amanda::Logfile::match_disk($ARGV[$i], $diskname)) { ++ if (match_disk($ARGV[$i], $diskname)) { + debug("send: DISK " . Amanda::Util::quote_string($diskname)); + print {$amservice_in} "DISK " . Amanda::Util::quote_string($diskname) . "\n"; + my $a = <$amservice_out>; +@@ -118,7 +118,7 @@ + #find the diskname that match + for (my $i=1; $i <= $#ARGV; $i++) { + for my $diskname (@disks) { +- if (Amanda::Logfile::match_disk($ARGV[$i], $diskname)) { ++ if (match_disk($ARGV[$i], $diskname)) { + debug("send: DISK " . Amanda::Util::quote_string($diskname)); + print {$amservice_in} "DISK " . Amanda::Util::quote_string($diskname) . "\n"; + my $a = <$amservice_out>; +Index: amanda/branches/3_3/server-src/amvault.pl +=================================================================== +--- amanda/branches/3_3/server-src/amvault.pl (revision 4389) ++++ amanda/branches/3_3/server-src/amvault.pl (revision 4390) +@@ -108,8 +108,8 @@ + use Amanda::Cmdline; + use Amanda::Paths; + use Amanda::Logfile qw( :logtype_t log_add log_add_full +- log_rename $amanda_log_trace_log make_stats +- match_datestamp match_level ); ++ log_rename $amanda_log_trace_log make_stats ); ++use Amanda::Util qw ( match_datestamp match_level ); + + use base qw( + Amanda::Recovery::Clerk::Feedback +Index: amanda/branches/3_3/server-src/amidxtaped.pl +=================================================================== +--- amanda/branches/3_3/server-src/amidxtaped.pl (revision 4389) ++++ amanda/branches/3_3/server-src/amidxtaped.pl (revision 4390) +@@ -118,7 +118,7 @@ + + use Amanda::Debug qw( debug info warning ); + use Amanda::MainLoop qw( :GIOCondition ); +-use Amanda::Util qw( :constants ); ++use Amanda::Util qw( :constants match_disk match_host ); + use Amanda::Feature; + use Amanda::Config qw( :init :getconf ); + use Amanda::Changer; +@@ -130,7 +130,6 @@ + use Amanda::Recovery::Scan; + use Amanda::DB::Catalog; + use Amanda::Disklist; +-use Amanda::Logfile qw( match_disk match_host ); + + # Note that this class performs its control IO synchronously. This is adequate + # for this service, as it never receives unsolicited input from the remote +Index: amanda/branches/3_3/server-src/amdumpd.pl +=================================================================== +--- amanda/branches/3_3/server-src/amdumpd.pl (revision 4389) ++++ amanda/branches/3_3/server-src/amdumpd.pl (revision 4390) +@@ -39,7 +39,7 @@ + use Amanda::Cmdline; + use Amanda::Paths; + use Amanda::Disklist; +-use Amanda::Logfile qw( match_disk match_host ); ++use Amanda::Util qw( match_disk match_host ); + + # Note that this class performs its control IO synchronously. This is adequate + # for this service, as it never receives unsolicited input from the remote +Index: amanda/branches/3_3/perl/Amanda/Logfile.swg +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Logfile.swg (revision 4389) ++++ amanda/branches/3_3/perl/Amanda/Logfile.swg (revision 4390) +@@ -251,7 +251,6 @@ + + amglue_export_ok( + find_log search_logfile dumps_match log_rename +- match_host match_disk match_datestamp match_level + ); + + char **find_log(void); +@@ -289,13 +288,6 @@ + amglue_dumpspec_list *dumpspecs, + gboolean ok); + +-/* these are actually available for clients as well, but they do not deserve +- * their own perl module, so they're stuck here */ +-gboolean match_host(char *pat, char *value); +-gboolean match_disk(char *pat, char *value); +-gboolean match_datestamp(char *pat, char *value); +-gboolean match_level(char *pat, char *value); +- + %immutable; + amanda_log_handler_t *amanda_log_trace_log; + %mutable; +Index: amanda/branches/3_3/perl/Amanda/DB/Catalog.pm +=================================================================== +--- amanda/branches/3_3/perl/Amanda/DB/Catalog.pm (revision 4389) ++++ amanda/branches/3_3/perl/Amanda/DB/Catalog.pm (revision 4390) +@@ -401,11 +401,10 @@ + + =cut + +-use Amanda::Logfile qw( :constants match_disk match_host +- match_datestamp match_level ); ++use Amanda::Logfile qw( :constants ); + use Amanda::Tapelist; + use Amanda::Config qw( :init :getconf config_dir_relative ); +-use Amanda::Util qw( quote_string weaken_ref ); ++use Amanda::Util qw( quote_string weaken_ref match_disk match_host match_datestamp match_level); + use File::Glob qw( :glob ); + use warnings; + use strict; +Index: amanda/branches/3_3/perl/Amanda/Util.pod +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Util.pod (revision 4389) ++++ amanda/branches/3_3/perl/Amanda/Util.pod (revision 4390) +@@ -421,7 +421,17 @@ + burp $filename, $header; + + These functions can (and should) be exported to the main namespace +- ++ ++=head1 MATCHING ++ ++The following functions are available to match strings against patterns using ++the rules described in amanda(8): ++ ++ match_host($pat, $str); ++ match_disk($pat, $str); ++ match_datestamp($pat, $str); ++ match_level($pat, $str); ++ + =cut + + %} +Index: amanda/branches/3_3/perl/Amanda/Logfile.pod +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Logfile.pod (revision 4389) ++++ amanda/branches/3_3/perl/Amanda/Logfile.pod (revision 4390) +@@ -206,16 +206,6 @@ + + All of these functions can be imported by name. + +-=head1 MATCHING +- +-The following functions are available to match strings against patterns using +-the rules described in amanda(8): +- +- match_host($pat, $str); +- match_disk($pat, $str); +- match_datestamp($pat, $str); +- match_level($pat, $str); +- + =head1 DEBUG LOGGING HANDLER + + This package provides C<$amanda_log_trace_log>, which sends C +Index: amanda/branches/3_3/perl/Amanda/Util.swg +=================================================================== +--- amanda/branches/3_3/perl/Amanda/Util.swg (revision 4389) ++++ amanda/branches/3_3/perl/Amanda/Util.swg (revision 4390) +@@ -633,6 +633,16 @@ + + %} + ++amglue_export_ok( ++ match_host match_disk match_datestamp match_level ++); ++ ++gboolean match_host(char *pat, char *value); ++gboolean match_disk(char *pat, char *value); ++gboolean match_datestamp(char *pat, char *value); ++gboolean match_level(char *pat, char *value); ++ ++ + /* ------------------------------------------------------------------------- + * Functions below this line are only meant to be called within this module; + * do not call them externally. */ diff --git a/amanda.spec b/amanda.spec index 935eb62..f119429 100644 --- a/amanda.spec +++ b/amanda.spec @@ -18,6 +18,7 @@ Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch Patch7: amanda-3.3.0-qw.patch +Patch8: amanda-3.3.0-match_disk.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -82,6 +83,7 @@ server also needs to have the amanda-client package installed. %patch3 -p1 -b .tcpport %patch6 -p1 -b .config %patch7 -p3 -b .qw +%patch8 -p3 -b .match_disk ./autogen %build @@ -433,6 +435,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * 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 From 43ab4fda2d031150cdb847dab7eacc3eb001e85f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:13:10 -0600 Subject: [PATCH 026/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index f119429..6f07659 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -433,6 +433,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 257a3a8fecb0a6270f219515a653063a43ee3460 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 18 Apr 2012 12:21:57 +0200 Subject: [PATCH 027/182] Fix building issues with newer glib --- amanda-3.3.0-glib.patch | 42 +++++++++++++++++++++++++++++++++++++++++ amanda.spec | 7 ++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 amanda-3.3.0-glib.patch 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.spec b/amanda.spec index 6f07659..5bbb9d1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -19,6 +19,7 @@ Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch Patch7: amanda-3.3.0-qw.patch Patch8: amanda-3.3.0-match_disk.patch +Patch9: amanda-3.3.0-glib.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -84,6 +85,7 @@ server also needs to have the amanda-client package installed. %patch6 -p1 -b .config %patch7 -p3 -b .qw %patch8 -p3 -b .match_disk +%patch9 -p2 -b .glib ./autogen %build @@ -433,6 +435,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From f54768d32fb6e21388ada72bb312127a8eb61a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 11 Jun 2012 14:20:45 +0200 Subject: [PATCH 028/182] Perl 5.16 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 5bbb9d1..2f12a1b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -435,6 +435,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From c9faf05a1b33cf4db729f68c501d2ede1cb2cde7 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 20 Jun 2012 12:27:16 +0200 Subject: [PATCH 029/182] amanda-3.3.1 --- .gitignore | 1 + amanda-3.3.0-match_disk.patch | 189 ---------------------------------- amanda-3.3.0-qw.patch | 106 ------------------- amanda-3.3.1-stdio.patch | 15 +++ amanda.spec | 17 +-- sources | 2 +- 6 files changed, 27 insertions(+), 303 deletions(-) delete mode 100644 amanda-3.3.0-match_disk.patch delete mode 100644 amanda-3.3.0-qw.patch create mode 100644 amanda-3.3.1-stdio.patch diff --git a/.gitignore b/.gitignore index c32f3d3..10f667f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ amanda-3.1.1.tar.gz /amanda-3.2.2.tar.gz /amanda-3.3.0beta1.tar.gz /amanda-3.3.0.tar.gz +/amanda-3.3.1.tar.gz diff --git a/amanda-3.3.0-match_disk.patch b/amanda-3.3.0-match_disk.patch deleted file mode 100644 index b354d34..0000000 --- a/amanda-3.3.0-match_disk.patch +++ /dev/null @@ -1,189 +0,0 @@ -Index: amanda/branches/3_3/client-src/amdump_client.pl -=================================================================== ---- amanda/branches/3_3/client-src/amdump_client.pl (revision 4389) -+++ amanda/branches/3_3/client-src/amdump_client.pl (revision 4390) -@@ -28,7 +28,7 @@ - use Amanda::Util qw( :constants ); - use Amanda::Config qw( :init :getconf ); - use Amanda::Paths; --use Amanda::Logfile qw( log_rename get_current_log_timestamp $amanda_log_trace_log ); -+use Amanda::Util qw ( match_disk ); - use Amanda::Debug qw( debug ); - - Amanda::Util::setup_application("amdump_client", "client", $CONTEXT_CMDLINE); -@@ -95,7 +95,7 @@ - #find the diskname that match - for (my $i=1; $i <= $#ARGV; $i++) { - for my $diskname (@disks) { -- if (Amanda::Logfile::match_disk($ARGV[$i], $diskname)) { -+ if (match_disk($ARGV[$i], $diskname)) { - debug("send: DISK " . Amanda::Util::quote_string($diskname)); - print {$amservice_in} "DISK " . Amanda::Util::quote_string($diskname) . "\n"; - my $a = <$amservice_out>; -@@ -118,7 +118,7 @@ - #find the diskname that match - for (my $i=1; $i <= $#ARGV; $i++) { - for my $diskname (@disks) { -- if (Amanda::Logfile::match_disk($ARGV[$i], $diskname)) { -+ if (match_disk($ARGV[$i], $diskname)) { - debug("send: DISK " . Amanda::Util::quote_string($diskname)); - print {$amservice_in} "DISK " . Amanda::Util::quote_string($diskname) . "\n"; - my $a = <$amservice_out>; -Index: amanda/branches/3_3/server-src/amvault.pl -=================================================================== ---- amanda/branches/3_3/server-src/amvault.pl (revision 4389) -+++ amanda/branches/3_3/server-src/amvault.pl (revision 4390) -@@ -108,8 +108,8 @@ - use Amanda::Cmdline; - use Amanda::Paths; - use Amanda::Logfile qw( :logtype_t log_add log_add_full -- log_rename $amanda_log_trace_log make_stats -- match_datestamp match_level ); -+ log_rename $amanda_log_trace_log make_stats ); -+use Amanda::Util qw ( match_datestamp match_level ); - - use base qw( - Amanda::Recovery::Clerk::Feedback -Index: amanda/branches/3_3/server-src/amidxtaped.pl -=================================================================== ---- amanda/branches/3_3/server-src/amidxtaped.pl (revision 4389) -+++ amanda/branches/3_3/server-src/amidxtaped.pl (revision 4390) -@@ -118,7 +118,7 @@ - - use Amanda::Debug qw( debug info warning ); - use Amanda::MainLoop qw( :GIOCondition ); --use Amanda::Util qw( :constants ); -+use Amanda::Util qw( :constants match_disk match_host ); - use Amanda::Feature; - use Amanda::Config qw( :init :getconf ); - use Amanda::Changer; -@@ -130,7 +130,6 @@ - use Amanda::Recovery::Scan; - use Amanda::DB::Catalog; - use Amanda::Disklist; --use Amanda::Logfile qw( match_disk match_host ); - - # Note that this class performs its control IO synchronously. This is adequate - # for this service, as it never receives unsolicited input from the remote -Index: amanda/branches/3_3/server-src/amdumpd.pl -=================================================================== ---- amanda/branches/3_3/server-src/amdumpd.pl (revision 4389) -+++ amanda/branches/3_3/server-src/amdumpd.pl (revision 4390) -@@ -39,7 +39,7 @@ - use Amanda::Cmdline; - use Amanda::Paths; - use Amanda::Disklist; --use Amanda::Logfile qw( match_disk match_host ); -+use Amanda::Util qw( match_disk match_host ); - - # Note that this class performs its control IO synchronously. This is adequate - # for this service, as it never receives unsolicited input from the remote -Index: amanda/branches/3_3/perl/Amanda/Logfile.swg -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Logfile.swg (revision 4389) -+++ amanda/branches/3_3/perl/Amanda/Logfile.swg (revision 4390) -@@ -251,7 +251,6 @@ - - amglue_export_ok( - find_log search_logfile dumps_match log_rename -- match_host match_disk match_datestamp match_level - ); - - char **find_log(void); -@@ -289,13 +288,6 @@ - amglue_dumpspec_list *dumpspecs, - gboolean ok); - --/* these are actually available for clients as well, but they do not deserve -- * their own perl module, so they're stuck here */ --gboolean match_host(char *pat, char *value); --gboolean match_disk(char *pat, char *value); --gboolean match_datestamp(char *pat, char *value); --gboolean match_level(char *pat, char *value); -- - %immutable; - amanda_log_handler_t *amanda_log_trace_log; - %mutable; -Index: amanda/branches/3_3/perl/Amanda/DB/Catalog.pm -=================================================================== ---- amanda/branches/3_3/perl/Amanda/DB/Catalog.pm (revision 4389) -+++ amanda/branches/3_3/perl/Amanda/DB/Catalog.pm (revision 4390) -@@ -401,11 +401,10 @@ - - =cut - --use Amanda::Logfile qw( :constants match_disk match_host -- match_datestamp match_level ); -+use Amanda::Logfile qw( :constants ); - use Amanda::Tapelist; - use Amanda::Config qw( :init :getconf config_dir_relative ); --use Amanda::Util qw( quote_string weaken_ref ); -+use Amanda::Util qw( quote_string weaken_ref match_disk match_host match_datestamp match_level); - use File::Glob qw( :glob ); - use warnings; - use strict; -Index: amanda/branches/3_3/perl/Amanda/Util.pod -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Util.pod (revision 4389) -+++ amanda/branches/3_3/perl/Amanda/Util.pod (revision 4390) -@@ -421,7 +421,17 @@ - burp $filename, $header; - - These functions can (and should) be exported to the main namespace -- -+ -+=head1 MATCHING -+ -+The following functions are available to match strings against patterns using -+the rules described in amanda(8): -+ -+ match_host($pat, $str); -+ match_disk($pat, $str); -+ match_datestamp($pat, $str); -+ match_level($pat, $str); -+ - =cut - - %} -Index: amanda/branches/3_3/perl/Amanda/Logfile.pod -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Logfile.pod (revision 4389) -+++ amanda/branches/3_3/perl/Amanda/Logfile.pod (revision 4390) -@@ -206,16 +206,6 @@ - - All of these functions can be imported by name. - --=head1 MATCHING -- --The following functions are available to match strings against patterns using --the rules described in amanda(8): -- -- match_host($pat, $str); -- match_disk($pat, $str); -- match_datestamp($pat, $str); -- match_level($pat, $str); -- - =head1 DEBUG LOGGING HANDLER - - This package provides C<$amanda_log_trace_log>, which sends C -Index: amanda/branches/3_3/perl/Amanda/Util.swg -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Util.swg (revision 4389) -+++ amanda/branches/3_3/perl/Amanda/Util.swg (revision 4390) -@@ -633,6 +633,16 @@ - - %} - -+amglue_export_ok( -+ match_host match_disk match_datestamp match_level -+); -+ -+gboolean match_host(char *pat, char *value); -+gboolean match_disk(char *pat, char *value); -+gboolean match_datestamp(char *pat, char *value); -+gboolean match_level(char *pat, char *value); -+ -+ - /* ------------------------------------------------------------------------- - * Functions below this line are only meant to be called within this module; - * do not call them externally. */ diff --git a/amanda-3.3.0-qw.patch b/amanda-3.3.0-qw.patch deleted file mode 100644 index 2eb0a84..0000000 --- a/amanda-3.3.0-qw.patch +++ /dev/null @@ -1,106 +0,0 @@ -Index: amanda/branches/3_3/perl/Amanda/Changer/robot.pm -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Changer/robot.pm (revision 4171) -+++ amanda/branches/3_3/perl/Amanda/Changer/robot.pm (revision 4172) -@@ -266,7 +266,7 @@ - } - - # status-interval, eject-delay, unload-delay -- for my $propname qw(status-interval eject-delay unload-delay) { -+ for my $propname (qw(status-interval eject-delay unload-delay)) { - next unless exists $config->{'properties'}->{$propname}; - if (@{$config->{'properties'}->{$propname}->{'values'}} > 1) { - return Amanda::Changer->make_error("fatal", undef, -Index: amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm (revision 4171) -+++ amanda/branches/3_3/perl/Amanda/Recovery/Planner.pm (revision 4172) -@@ -228,7 +228,7 @@ - my $self = shift; - my %params = @_; - -- for my $rq_param qw(changer plan_cb dumpspecs) { -+ for my $rq_param (qw(changer plan_cb dumpspecs)) { - croak "required parameter '$rq_param' mising" - unless exists $params{$rq_param}; - } -@@ -339,7 +339,7 @@ - my $self = shift; - my %params = @_; - -- for my $rq_param qw(holding_file plan_cb) { -+ for my $rq_param (qw(holding_file plan_cb)) { - croak "required parameter '$rq_param' mising" - unless exists $params{$rq_param}; - } -@@ -390,7 +390,7 @@ - my $self = shift; - my %params = @_; - -- for my $rq_param qw(filelist plan_cb) { -+ for my $rq_param (qw(filelist plan_cb)) { - croak "required parameter '$rq_param' mising" - unless exists $params{$rq_param}; - } -Index: amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm (revision 4171) -+++ amanda/branches/3_3/perl/Amanda/Recovery/Clerk.pm (revision 4172) -@@ -228,7 +228,7 @@ - my $self = shift; - my %params = @_; - -- for my $rq_param qw(dump xfer_src_cb) { -+ for my $rq_param (qw(dump xfer_src_cb)) { - croak "required parameter '$rq_param' missing" - unless exists $params{$rq_param}; - } -@@ -262,7 +262,7 @@ - my %params = @_; - - $self->dbg("starting recovery"); -- for my $rq_param qw(xfer recovery_cb) { -+ for my $rq_param (qw(xfer recovery_cb)) { - croak "required parameter '$rq_param' missing" - unless exists $params{$rq_param}; - } -Index: amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm -=================================================================== ---- amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm (revision 4171) -+++ amanda/branches/3_3/perl/Amanda/Taper/Scribe.pm (revision 4172) -@@ -442,7 +442,7 @@ - my %params = @_; - - my $decide_debug = $Amanda::Config::debug_taper || $params{'debug'}; -- for my $rq_param qw(taperscan feedback) { -+ for my $rq_param (qw(taperscan feedback)) { - croak "required parameter '$rq_param' mising" - unless exists $params{$rq_param}; - } -@@ -491,7 +491,7 @@ - my $self = shift; - my %params = @_; - -- for my $rq_param qw(write_timestamp finished_cb) { -+ for my $rq_param (qw(write_timestamp finished_cb)) { - croak "required parameter '$rq_param' missing" - unless exists $params{$rq_param}; - } -@@ -615,7 +615,7 @@ - my $self = shift; - my %params = @_; - -- for my $rq_param qw(max_memory) { -+ for my $rq_param (qw(max_memory)) { - croak "required parameter '$rq_param' missing" - unless exists $params{$rq_param}; - } -@@ -1622,7 +1622,7 @@ - my $self = shift; - my %params = @_; - -- for my $rq_param qw(finished_cb) { -+ for my $rq_param (qw(finished_cb)) { - croak "required parameter '$rq_param' mising" - unless exists $params{$rq_param}; - } diff --git a/amanda-3.3.1-stdio.patch b/amanda-3.3.1-stdio.patch new file mode 100644 index 0000000..5b5cf75 --- /dev/null +++ b/amanda-3.3.1-stdio.patch @@ -0,0 +1,15 @@ +diff --git a/gnulib/stdio.in.h b/gnulib/stdio.in.h +index 80b9dbf..dc2dc9a 100644 +--- a/gnulib/stdio.in.h ++++ b/gnulib/stdio.in.h +@@ -140,8 +140,8 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ +-#undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++//#undef gets ++//_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/amanda.spec b/amanda.spec index 2f12a1b..15604d9 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,8 +7,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.0 -Release: 6%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -17,9 +17,9 @@ Source8: amandahosts Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch -Patch7: amanda-3.3.0-qw.patch -Patch8: amanda-3.3.0-match_disk.patch Patch9: amanda-3.3.0-glib.patch +Patch10: amanda-3.3.1-stdio.patch + License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org @@ -83,9 +83,8 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch6 -p1 -b .config -%patch7 -p3 -b .qw -%patch8 -p3 -b .match_disk %patch9 -p2 -b .glib +%patch10 -p1 -b .stdio ./autogen %build @@ -260,6 +259,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/amcrypt.8* %{_mandir}/man8/amgpgcrypt.8* %{_mandir}/man8/amgetconf.8* +%{_mandir}/man8/amcleanupdisk.8* %dir %{_sysconfdir}/amanda/ %dir %{_sysconfdir}/amanda/%defconfig @@ -272,7 +272,6 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %{_libdir}/libamdevice*.so %{_libdir}/libamserver*.so -%{_libexecdir}/amanda/amcleanupdisk %{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amcheck-device %{_libexecdir}/amanda/amidxtaped @@ -294,6 +293,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/amaddclient %{_sbindir}/amadmin %{_sbindir}/amcleanup +%{_sbindir}/amcleanupdisk %{_sbindir}/amdevcheck %{_sbindir}/amdump %{_sbindir}/amfetchdump @@ -435,6 +435,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/sources b/sources index d173bd7..ecccdb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e206f42fb523c6bfe728b03665d4e277 amanda-3.3.0.tar.gz +dae7631b4abcf7eac874df6e3740e75b amanda-3.3.1.tar.gz From f2047c49815fea640e29c160897beafad3122a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 27 Jun 2012 16:01:31 +0200 Subject: [PATCH 030/182] Perl 5.16 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 15604d9..c7cca33 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -435,6 +435,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From b10bd934d5ef306abc9e766374b54c8c0ff7ec6a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:55:18 -0500 Subject: [PATCH 031/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index c7cca33..6cb69cb 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -435,6 +435,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 1885f8d3d61c72618d7cfe91633beb3d97cde284 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 16 Aug 2012 11:03:25 +0200 Subject: [PATCH 032/182] amanda-3.3.2 --- amanda-xinetd | 25 ------------------------- amanda.socket | 9 +++++++++ amanda.spec | 39 ++++++++++++++++++++++++--------------- amanda@.service | 9 +++++++++ sources | 2 +- 5 files changed, 43 insertions(+), 41 deletions(-) delete mode 100644 amanda-xinetd create mode 100644 amanda.socket create mode 100644 amanda@.service diff --git a/amanda-xinetd b/amanda-xinetd deleted file mode 100644 index ec084ae..0000000 --- a/amanda-xinetd +++ /dev/null @@ -1,25 +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 -{ - flags = IPv4 - socket_type = stream - protocol = tcp - wait = no - user = amandabackup - group = disk - groups = yes - server = /usr/sbin/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=bsdtcp 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 6cb69cb..ecc4b24 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,5 +1,5 @@ %define _libexecdir %{_libdir} -%{!?defconfig:%define defconfig DailySet1} +%define defconfig DailySet1 %{!?indexserver:%define indexserver amandahost} %{!?tapeserver:%define tapeserver %{indexserver}} %{!?amanda_user:%define amanda_user amandabackup} @@ -7,17 +7,17 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.1 -Release: 3%{?dist} -Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz +Version: 3.3.2 +Release: 1%{?dist} +Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist -Source5: amanda-xinetd Source8: amandahosts +Source9: amanda.socket +Source10: amanda@.service Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch -Patch9: amanda-3.3.0-glib.patch Patch10: amanda-3.3.1-stdio.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 @@ -32,8 +32,10 @@ BuildRequires: perl-devel 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(post): grep sed systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires: fileutils grep initscripts tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Obsoletes: amanda-devel < 2.6.1p2-5 Provides: amanda-devel = 2.6.1p2-5 @@ -83,7 +85,6 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch6 -p1 -b .config -%patch9 -p2 -b .glib %patch10 -p1 -b .stdio ./autogen @@ -124,12 +125,11 @@ rm -rf ${RPM_BUILD_ROOT} make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/amanda -mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d -cp %SOURCE5 $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%{_localstatedir}/lib/amanda install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts +install -p -m 644 -D %{SOURCE9} %{buildroot}%{_unitdir}/amanda.socket +install -p -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/amanda@.service ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8 @@ -162,11 +162,14 @@ rm -rf ${RPM_BUILD_ROOT} %post /sbin/ldconfig -[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : +%systemd_post amanda.socket + +%preun +%systemd_preun amanda.socket %postun /sbin/ldconfig -[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : +%systemd_postun_with_restart amanda.socket %post client -p /sbin/ldconfig @@ -179,7 +182,9 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %doc COPYRIGHT* NEWS README -%config(noreplace) /etc/xinetd.d/amanda +%{_unitdir}/amanda@.service +%{_unitdir}/amanda.socket + %{_libdir}/libamanda-*.so %{_libdir}/libamanda.so @@ -435,6 +440,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/amanda@.service b/amanda@.service new file mode 100644 index 0000000..24adab4 --- /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 +StandardInput=socket diff --git a/sources b/sources index ecccdb8..ca969e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dae7631b4abcf7eac874df6e3740e75b amanda-3.3.1.tar.gz +1a6cfe47eaee121f22540ac5fa58c366 amanda-3.3.2.tar.gz From 8684f843189aa28c9ce2b10fda1613df14c00928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 18 Sep 2012 13:22:51 +0200 Subject: [PATCH 033/182] Do not provide perl(Math::BigInt) --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index ecc4b24..ac96d05 100644 --- a/amanda.spec +++ b/amanda.spec @@ -8,7 +8,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -40,7 +40,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Obsoletes: amanda-devel < 2.6.1p2-5 Provides: amanda-devel = 2.6.1p2-5 -%global __perl_provides /bin/sh -c "/usr/lib/rpm/perl.prov | grep -v \\\"perl(Math::BigInt)\\\"" +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\) %description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a @@ -440,6 +440,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 87a801f54c55999a7f14b74fcdcb5bac498d3612 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 7 Dec 2012 10:22:32 +0100 Subject: [PATCH 034/182] Fix group ownership Add manpage for activate-devpay --- activate-devpay.1.gz | Bin 0 -> 366 bytes amanda.spec | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 activate-devpay.1.gz diff --git a/activate-devpay.1.gz b/activate-devpay.1.gz new file mode 100644 index 0000000000000000000000000000000000000000..b791af3ca7044d9c714d69cbda800557f23624da GIT binary patch literal 366 zcmV-!0g?V6iwFn+tH4kI17TxyX?9_BWi4c7c5q>NE-?U=kl#zgFc8Pz^H&^uaRXP8 zy^7fVU@K@hmToZc<=Wob;F^>q?W}*jNjE_R1t0Q|T<-Jv-UZ1D!dVjS!(=g@FZP@8 z0QW55D~Q9F1;fmW7A=i)YHRG^bqtv%_W-tZN4=2*lsROitvHIzSB~OD298QYSmB3~ zz$ZPBAL8|fN1O#y_`&V#gZYBbw$Ubu*71NPr7%!yRcNfPPV*n>ya(SH#zj@12$H^y zlWs*uFysjz1po)tK!(zTB{as5rOX%YENs~;`2<`}*B7u$t_o#?C#bO?IHUWig|&|0 z{k~yNsc_U~yt{iAvU!JG7^_9vSfM0KDZ`74Kxt73=~>rNbLGrZStzk3!0#$&_j?L= z$!fj*J4o8WG)Fh~5_L)h52?RB6<7qBsvd9IuSrd3ELAXcSslHDl>A - 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) From a2306d8312aa7b772308bc056ede0e6295e95dad Mon Sep 17 00:00:00 2001 From: phracek Date: Thu, 31 Jan 2013 14:55:28 +0100 Subject: [PATCH 035/182] (#858703) add killpgrp(8) man page to the amanda-client package (will be removed from man-pages package) --- amanda.spec | 9 ++++++++- killpgrp.8 | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 killpgrp.8 diff --git a/amanda.spec b/amanda.spec index 04ea55d..2fdd188 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -18,6 +18,7 @@ Source8: amandahosts Source9: amanda.socket Source10: amanda@.service Source11: activate-devpay.1.gz +Source12: killpgrp.8 Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch @@ -134,6 +135,7 @@ install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts install -p -m 644 -D %{SOURCE9} %{buildroot}%{_unitdir}/amanda.socket install -p -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/amanda@.service install -D %{SOURCE11} %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz +install -D %{SOURCE12} %{buildroot}/%{_mandir}/man8/killpgrp.8.gz ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8 @@ -269,6 +271,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/amgpgcrypt.8* %{_mandir}/man8/amgetconf.8* %{_mandir}/man8/amcleanupdisk.8* +%{_mandir}/man8/killpgrp.8* %dir %{_sysconfdir}/amanda/ %dir %{_sysconfdir}/amanda/%defconfig @@ -445,6 +448,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) + * Thu Dec 06 2012 Lukáš Nykrýn - 3.3.2-3 - Fix group ownership - Add manpage for activate-devpay 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 From c94922093cad3e39b1898dcf41539ca18cd7df81 Mon Sep 17 00:00:00 2001 From: phracek Date: Thu, 31 Jan 2013 15:59:51 +0100 Subject: [PATCH 036/182] add killpgrp(8) man page to the amanda-client package --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 2fdd188..ccde962 100644 --- a/amanda.spec +++ b/amanda.spec @@ -271,7 +271,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/amgpgcrypt.8* %{_mandir}/man8/amgetconf.8* %{_mandir}/man8/amcleanupdisk.8* -%{_mandir}/man8/killpgrp.8* %dir %{_sysconfdir}/amanda/ %dir %{_sysconfdir}/amanda/%defconfig @@ -435,6 +434,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/amsuntar.8* %{_mandir}/man8/amzfs-sendrecv.8* %{_mandir}/man8/amzfs-snapshot.8* +%{_mandir}/man8/killpgrp.8* %{perl_vendorarch}/Amanda/Application.pm %{perl_vendorarch}/Amanda/Application/ From 499fc77f9129def480f4742c81eb4d92f45c3cb7 Mon Sep 17 00:00:00 2001 From: phracek Date: Fri, 1 Feb 2013 09:29:39 +0100 Subject: [PATCH 037/182] fix autogen for parallel test --- amanda-3.3.2-autogen.patch | 10 ++++++++++ amanda.spec | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 amanda-3.3.2-autogen.patch diff --git a/amanda-3.3.2-autogen.patch b/amanda-3.3.2-autogen.patch new file mode 100644 index 0000000..e12af16 --- /dev/null +++ b/amanda-3.3.2-autogen.patch @@ -0,0 +1,10 @@ +diff --git a/autogen b/autogen +index 1d593d8..7cb7343 100755 +--- a/autogen ++++ b/autogen +@@ -57,4 +57,4 @@ autoheader || die "autoheader failed" + touch config/config.h.in + + echo "..automake" +-automake --force --copy --warnings=none || die "automake failed" ++automake --add-missing --force --copy --warnings=none || die "automake failed" diff --git a/amanda.spec b/amanda.spec index ccde962..254b39f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -23,6 +23,7 @@ Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch Patch10: amanda-3.3.1-stdio.patch +Patch11: amanda-3.3.2-autogen.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -90,6 +91,7 @@ server also needs to have the amanda-client package installed. %patch3 -p1 -b .tcpport %patch6 -p1 -b .config %patch10 -p1 -b .stdio +%patch11 -p1 -b .autogen ./autogen %build @@ -451,6 +453,7 @@ rm -rf ${RPM_BUILD_ROOT} * 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 From 35a252555af34023154305a61fc5ce999447699f Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Thu, 21 Mar 2013 14:15:57 +0100 Subject: [PATCH 038/182] Changing requires from /sbin/service to /usr/sbin/service --- amanda.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 254b39f..cc0bb48 100644 --- a/amanda.spec +++ b/amanda.spec @@ -63,7 +63,7 @@ well. %package client Summary: The client component of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep /sbin/service +Requires: fileutils grep /usr/sbin/service Requires(pre): amanda = %{version}-%{release} %description client @@ -75,7 +75,7 @@ AMANDA client machine. %package server Summary: The server side of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep /sbin/service +Requires: fileutils grep /usr/sbin/service Requires(pre): amanda = %{version}-%{release} %description server From bbd8475098c66b8211a129b251b51f6000bb8b58 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Thu, 21 Mar 2013 15:45:56 +0100 Subject: [PATCH 039/182] Requires were changed to /usr/sbin/service --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index cc0bb48..2be547b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -450,6 +450,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Mar 21 2013 Petr Hracek - 3.3.2-5 +- 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) From 8d2044eca92f3fb50ff45bb5aeb600edf1fd5cd6 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Thu, 21 Mar 2013 16:07:16 +0100 Subject: [PATCH 040/182] Fix (#924326) requires was changed to /usr/sbin/service --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 2be547b..1390ebf 100644 --- a/amanda.spec +++ b/amanda.spec @@ -451,7 +451,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * Thu Mar 21 2013 Petr Hracek - 3.3.2-5 -- Requires /sbin/service was changed to /usr/sbin/service +- 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 From c2fc17aa580a149e8a089e1526fc4efcfe45a662 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 22 Mar 2013 09:48:58 +0100 Subject: [PATCH 041/182] update to new upstream version --- .gitignore | 1 + amanda.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 10f667f..dd8550e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.0beta1.tar.gz /amanda-3.3.0.tar.gz /amanda-3.3.1.tar.gz +/amanda-3.3.3.tar.gz diff --git a/amanda.spec b/amanda.spec index 2be547b..f6b69e3 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.2 -Release: 5%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -63,7 +63,7 @@ well. %package client Summary: The client component of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep /usr/sbin/service +Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} %description client @@ -75,7 +75,7 @@ AMANDA client machine. %package server Summary: The server side of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep /usr/sbin/service +Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} %description server @@ -363,6 +363,7 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/DB/ %{perl_vendorarch}/Amanda/Device.pm %{perl_vendorarch}/Amanda/Disklist.pm +%{perl_vendorarch}/Amanda/Extract.pm %{perl_vendorarch}/Amanda/Holding.pm %{perl_vendorarch}/Amanda/Changer/ %{perl_vendorarch}/Amanda/Changer.pm @@ -450,6 +451,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 - Requires /sbin/service was changed to /usr/sbin/service @@ -805,7 +811,7 @@ rm -rf ${RPM_BUILD_ROOT} - New upstream version - Turn on --disable-dependency-tracking to work around an automake bug. -* Fri Jun 28 2004 Jay Fenlason 2.4.4p3-1 +* Mon Jun 28 2004 Jay Fenlason 2.4.4p3-1 - New upstream version * Tue Jun 15 2004 Elliot Lee diff --git a/sources b/sources index ca969e4..f40562a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a6cfe47eaee121f22540ac5fa58c366 amanda-3.3.2.tar.gz +2b9c7fbc030d7c242197cc8367e9a6b8 amanda-3.3.3.tar.gz From 87f8a1ad955bdc9db230f5155f8c09017c40f61c Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 22 Mar 2013 09:48:58 +0100 Subject: [PATCH 042/182] update to new upstream version --- .gitignore | 1 + amanda.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 10f667f..dd8550e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.0beta1.tar.gz /amanda-3.3.0.tar.gz /amanda-3.3.1.tar.gz +/amanda-3.3.3.tar.gz diff --git a/amanda.spec b/amanda.spec index 1390ebf..0fa4968 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.2 -Release: 5%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -63,7 +63,7 @@ well. %package client Summary: The client component of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep /usr/sbin/service +Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} %description client @@ -75,7 +75,7 @@ AMANDA client machine. %package server Summary: The server side of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep /usr/sbin/service +Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} %description server @@ -363,6 +363,7 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/DB/ %{perl_vendorarch}/Amanda/Device.pm %{perl_vendorarch}/Amanda/Disklist.pm +%{perl_vendorarch}/Amanda/Extract.pm %{perl_vendorarch}/Amanda/Holding.pm %{perl_vendorarch}/Amanda/Changer/ %{perl_vendorarch}/Amanda/Changer.pm @@ -450,6 +451,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 @@ -805,7 +811,7 @@ rm -rf ${RPM_BUILD_ROOT} - New upstream version - Turn on --disable-dependency-tracking to work around an automake bug. -* Fri Jun 28 2004 Jay Fenlason 2.4.4p3-1 +* Mon Jun 28 2004 Jay Fenlason 2.4.4p3-1 - New upstream version * Tue Jun 15 2004 Elliot Lee diff --git a/sources b/sources index ca969e4..f40562a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a6cfe47eaee121f22540ac5fa58c366 amanda-3.3.2.tar.gz +2b9c7fbc030d7c242197cc8367e9a6b8 amanda-3.3.3.tar.gz From 2ffb03d251e8b1941821a921aa748bcf0bb59af5 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 18 Jun 2013 14:21:14 +0200 Subject: [PATCH 043/182] Added systemd udp unit files (#901698) --- amanda-udp.socket | 9 +++++++++ amanda-udp@.service | 9 +++++++++ amanda.spec | 14 +++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 amanda-udp.socket create mode 100644 amanda-udp@.service 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-udp@.service b/amanda-udp@.service new file mode 100644 index 0000000..1054252 --- /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 +StandardInput=socket diff --git a/amanda.spec b/amanda.spec index 0fa4968..22d84ec 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -19,6 +19,8 @@ Source9: amanda.socket Source10: amanda@.service Source11: activate-devpay.1.gz Source12: killpgrp.8 +Source13: amanda-udp.socket +Source14: amanda-udp@.service Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch @@ -136,6 +138,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts 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 -D %{SOURCE11} %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz install -D %{SOURCE12} %{buildroot}/%{_mandir}/man8/killpgrp.8.gz @@ -171,13 +175,16 @@ rm -rf ${RPM_BUILD_ROOT} %post /sbin/ldconfig %systemd_post amanda.socket +%systemd_post amanda-udp.socket %preun %systemd_preun amanda.socket +%systemd_preun amanda-udp.socket %postun /sbin/ldconfig %systemd_postun_with_restart amanda.socket +%systemd_postun_with_restart amanda-udp.socket %post client -p /sbin/ldconfig @@ -192,6 +199,8 @@ rm -rf ${RPM_BUILD_ROOT} %doc COPYRIGHT* NEWS README %{_unitdir}/amanda@.service %{_unitdir}/amanda.socket +%{_unitdir}/amanda-udp@.service +%{_unitdir}/amanda-udp.socket %{_libdir}/libamanda-*.so @@ -451,6 +460,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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. From 290477eebba679a3cbdd6c19de783aa0630dd91c Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 25 Jun 2013 13:48:19 +0200 Subject: [PATCH 044/182] Remove dependency on dump in RHEL-7 --- amanda.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index f6b69e3..e3aadc4 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -30,7 +30,10 @@ Group: Applications/System URL: http://www.amanda.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool -BuildRequires: dump gnuplot cups samba-client tar grep fileutils +%if 0%{?fedora} +BuildRequires: dump +%endif +BuildRequires: 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) perl(Test::Simple) @@ -451,6 +454,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Jun 25 2013 Petr Hracek - 3.3.3-2 +- Remove dependency on dump in RHEL-7 + * Fri Mar 22 2013 Petr Hracek - 3.3.3-1 - New upstream version - Dependecy to /usr/sbin/service was removed. From cdb23143df80fa3448f3b3e41863bb4ad9dc6c7d Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 16 Jul 2013 10:55:02 +0200 Subject: [PATCH 045/182] Correct problem with format killpgrp.8 man page (#881128) --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 9d83ca3..e2e1494 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -144,7 +144,7 @@ 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 -D %{SOURCE11} %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz -install -D %{SOURCE12} %{buildroot}/%{_mandir}/man8/killpgrp.8.gz +install -D %{SOURCE12} %{buildroot}/%{_mandir}/man8/killpgrp.8 ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8 @@ -463,6 +463,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 7e5761084fbcce45f9830c5f9e4e0d0ce2921727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 18 Jul 2013 02:08:48 +0200 Subject: [PATCH 046/182] Perl 5.18 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index e2e1494..0bd563d 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -463,6 +463,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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)" From 04a336ac20a96280099cd601fad8bd781f4f7de3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:41:34 -0500 Subject: [PATCH 047/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 0bd563d..6dd9248 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 5%{?dist} +Release: 6%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -463,6 +463,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 54cad4b2151b7f0cd260f219fe338c2284353910 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Mon, 21 Oct 2013 15:41:15 +0200 Subject: [PATCH 048/182] Introduce amanda-libs package (#881128) --- amanda.spec | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/amanda.spec b/amanda.spec index 6dd9248..560d457 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 6%{?dist} +Release: 7%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -47,6 +47,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units Requires: fileutils grep initscripts tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: amanda-libs%{?_isa} = %{version}-%{release} Obsoletes: amanda-devel < 2.6.1p2-5 Provides: amanda-devel = 2.6.1p2-5 @@ -65,6 +66,15 @@ 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 +Group: Applications/System +Requires: fileutils 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 @@ -205,16 +215,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_unitdir}/amanda-udp@.service %{_unitdir}/amanda-udp.socket - -%{_libdir}/libamanda-*.so -%{_libdir}/libamanda.so -%{_libdir}/libamandad*.so -%{_libdir}/libamar*.so -%{_libdir}/libamglue*.so -%{_libdir}/libamxfer*.so -%{_libdir}/libndmjob*.so -%{_libdir}/libndmlib*.so - %dir %{_libexecdir}/amanda %{_libexecdir}/amanda/amandad %{_libexecdir}/amanda/amanda-sh-lib.sh @@ -293,10 +293,22 @@ rm -rf ${RPM_BUILD_ROOT} %attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts %attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda -%files server +%files libs %defattr(-,root,root) %{_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) %{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amcheck-device %{_libexecdir}/amanda/amidxtaped @@ -408,7 +420,6 @@ rm -rf ${RPM_BUILD_ROOT} %files client %defattr(-,root,root) -%{_libdir}/libamclient*.so %dir %{_libexecdir}/amanda/application/ %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amgtar @@ -463,6 +474,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 @@ -470,7 +484,7 @@ rm -rf ${RPM_BUILD_ROOT} - Perl 5.18 rebuild * Tue Jul 16 2013 Petr Hracek - 3.3.3-4 -- Correct problem with man page killpgrp (#881128)" +- Correct problem with man page killpgrp (#881128) * Tue Jun 25 2013 Petr Hracek - 3.3.3-3 - Remove dependency on dump in RHEL-7 From ff55033dc804a0258bd48394999ccbaf303e0382 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Thu, 31 Oct 2013 16:16:25 +0100 Subject: [PATCH 049/182] Moved all dynamic libraries to amanda-libs package --- amanda.spec | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/amanda.spec b/amanda.spec index 560d457..bcfa50b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -49,7 +49,6 @@ Requires: fileutils grep initscripts tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} Obsoletes: amanda-devel < 2.6.1p2-5 -Provides: amanda-devel = 2.6.1p2-5 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\) @@ -80,6 +79,7 @@ Summary: The client component of the AMANDA tape backup system Group: Applications/System Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} +Requires: amanda-libs%{?_isa} = %{version}-%{release} %description client The Amanda-client package should be installed on any machine that will @@ -92,6 +92,7 @@ Summary: The server side of the AMANDA tape backup system Group: Applications/System Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} +Requires: amanda-libs%{?_isa} = %{version}-%{release} %description server The amanda-server package should be installed on the AMANDA server, @@ -255,17 +256,6 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Tests.pm %{perl_vendorarch}/Amanda/Util.pm %{perl_vendorarch}/Amanda/Xfer.pm -%{perl_vendorarch}/auto/Amanda/Archive/ -%{perl_vendorarch}/auto/Amanda/Config/ -%{perl_vendorarch}/auto/Amanda/Debug/ -%{perl_vendorarch}/auto/Amanda/Feature/ -%{perl_vendorarch}/auto/Amanda/Header/ -%{perl_vendorarch}/auto/Amanda/IPC/ -%{perl_vendorarch}/auto/Amanda/MainLoop/ -%{perl_vendorarch}/auto/Amanda/NDMP/ -%{perl_vendorarch}/auto/Amanda/Tests/ -%{perl_vendorarch}/auto/Amanda/Util/ -%{perl_vendorarch}/auto/Amanda/Xfer/ %{_mandir}/man5/amanda-archive-format.5* %{_mandir}/man7/amanda-compatibility.7* @@ -306,6 +296,24 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libamxfer*.so %{_libdir}/libndmjob*.so %{_libdir}/libndmlib*.so +%{perl_vendorarch}/auto/Amanda/Application/ +%{perl_vendorarch}/auto/Amanda/Archive/ +%{perl_vendorarch}/auto/Amanda/Config/ +%{perl_vendorarch}/auto/Amanda/Debug/ +%{perl_vendorarch}/auto/Amanda/Feature/ +%{perl_vendorarch}/auto/Amanda/Header/ +%{perl_vendorarch}/auto/Amanda/IPC/ +%{perl_vendorarch}/auto/Amanda/MainLoop/ +%{perl_vendorarch}/auto/Amanda/NDMP/ +%{perl_vendorarch}/auto/Amanda/Tests/ +%{perl_vendorarch}/auto/Amanda/Util/ +%{perl_vendorarch}/auto/Amanda/Xfer/ +%{perl_vendorarch}/auto/Amanda/Cmdline/ +%{perl_vendorarch}/auto/Amanda/Device/ +%{perl_vendorarch}/auto/Amanda/Disklist/ +%{perl_vendorarch}/auto/Amanda/Logfile/ +%{perl_vendorarch}/auto/Amanda/Tapelist/ +%{perl_vendorarch}/auto/Amanda/XferServer/ %files server %defattr(-,root,root) @@ -401,12 +409,6 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Tapelist.pm %{perl_vendorarch}/Amanda/Taper/ %{perl_vendorarch}/Amanda/XferServer.pm -%{perl_vendorarch}/auto/Amanda/Cmdline/ -%{perl_vendorarch}/auto/Amanda/Device/ -%{perl_vendorarch}/auto/Amanda/Disklist/ -%{perl_vendorarch}/auto/Amanda/Logfile/ -%{perl_vendorarch}/auto/Amanda/Tapelist/ -%{perl_vendorarch}/auto/Amanda/XferServer/ %config(noreplace) %{_sysconfdir}/amanda/crontab.sample %config(noreplace) %{_sysconfdir}/amanda/%defconfig/* @@ -464,7 +466,6 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Application.pm %{perl_vendorarch}/Amanda/Application/ -%{perl_vendorarch}/auto/Amanda/Application/ %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf @@ -474,6 +475,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 7acf57a276ea65d1053b6ae371936d499f8f3b32 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 31 Jan 2014 09:29:13 +0100 Subject: [PATCH 050/182] Fix: #1056675 systemd file incorrectly named --- amanda-udp@.service => amanda-udp.service | 0 amanda.spec | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) rename amanda-udp@.service => amanda-udp.service (100%) diff --git a/amanda-udp@.service b/amanda-udp.service similarity index 100% rename from amanda-udp@.service rename to amanda-udp.service diff --git a/amanda.spec b/amanda.spec index bcfa50b..083aa0f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 8%{?dist} +Release: 9%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -20,7 +20,7 @@ Source10: amanda@.service Source11: activate-devpay.1.gz Source12: killpgrp.8 Source13: amanda-udp.socket -Source14: amanda-udp@.service +Source14: amanda-udp.service Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch @@ -213,7 +213,7 @@ rm -rf ${RPM_BUILD_ROOT} %doc COPYRIGHT* NEWS README %{_unitdir}/amanda@.service %{_unitdir}/amanda.socket -%{_unitdir}/amanda-udp@.service +%{_unitdir}/amanda-udp.service %{_unitdir}/amanda-udp.socket %dir %{_libexecdir}/amanda @@ -475,6 +475,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From a20abb3ca19008dff102847417d4160938d450d8 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 31 Jan 2014 10:31:19 +0100 Subject: [PATCH 051/182] Fix: #1056675 systemd file incorrectly named --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 083aa0f..f4d6337 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 9%{?dist} +Release: 10%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -153,7 +153,7 @@ install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts 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 %{SOURCE14} %{buildroot}%{_unitdir}/amanda-udp.service install -D %{SOURCE11} %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz install -D %{SOURCE12} %{buildroot}/%{_mandir}/man8/killpgrp.8 @@ -475,6 +475,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From d15eeeccfa55c7092f4697dd2f9830615c3f3e2d Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 8 Apr 2014 09:09:17 +0200 Subject: [PATCH 052/182] Remove initscripts from dependencies (#1081399) --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index f4d6337..29f3353 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.3 -Release: 10%{?dist} +Release: 11%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -45,7 +45,7 @@ Requires(pre): shadow-utils Requires(post): grep sed systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires: fileutils grep initscripts tar /bin/mail +Requires: fileutils grep tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} Obsoletes: amanda-devel < 2.6.1p2-5 @@ -475,6 +475,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From 26e4b1656de24647286e37cfae7e68e49e47c6f0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 23 May 2014 17:01:58 -0600 Subject: [PATCH 053/182] Update to 3.3.5 - Drop stdio patch, fixed upstream --- .gitignore | 1 + amanda-3.3.1-stdio.patch | 15 --------------- amanda.spec | 15 ++++++--------- sources | 2 +- 4 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 amanda-3.3.1-stdio.patch diff --git a/.gitignore b/.gitignore index dd8550e..686cc8f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.0.tar.gz /amanda-3.3.1.tar.gz /amanda-3.3.3.tar.gz +/amanda-3.3.5.tar.gz diff --git a/amanda-3.3.1-stdio.patch b/amanda-3.3.1-stdio.patch deleted file mode 100644 index 5b5cf75..0000000 --- a/amanda-3.3.1-stdio.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/gnulib/stdio.in.h b/gnulib/stdio.in.h -index 80b9dbf..dc2dc9a 100644 ---- a/gnulib/stdio.in.h -+++ b/gnulib/stdio.in.h -@@ -140,8 +140,8 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ --#undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+//#undef gets -+//_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/amanda.spec b/amanda.spec index 29f3353..271214a 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.3 -Release: 11%{?dist} +Version: 3.3.5 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -24,7 +24,6 @@ Source14: amanda-udp.service Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch -Patch10: amanda-3.3.1-stdio.patch Patch11: amanda-3.3.2-autogen.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 @@ -106,7 +105,6 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .xattrs %patch3 -p1 -b .tcpport %patch6 -p1 -b .config -%patch10 -p1 -b .stdio %patch11 -p1 -b .autogen ./autogen @@ -209,7 +207,6 @@ rm -rf ${RPM_BUILD_ROOT} %postun server -p /sbin/ldconfig %files -%defattr(-,root,root) %doc COPYRIGHT* NEWS README %{_unitdir}/amanda@.service %{_unitdir}/amanda.socket @@ -284,7 +281,6 @@ rm -rf ${RPM_BUILD_ROOT} %attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda %files libs -%defattr(-,root,root) %{_libdir}/libamdevice*.so %{_libdir}/libamserver*.so %{_libdir}/libamclient*.so @@ -316,7 +312,6 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/auto/Amanda/XferServer/ %files server -%defattr(-,root,root) %{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amcheck-device %{_libexecdir}/amanda/amidxtaped @@ -421,8 +416,6 @@ rm -rf ${RPM_BUILD_ROOT} %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/* %files client -%defattr(-,root,root) - %dir %{_libexecdir}/amanda/application/ %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amgtar %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amstar @@ -475,6 +468,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) diff --git a/sources b/sources index f40562a..c912d5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b9c7fbc030d7c242197cc8367e9a6b8 amanda-3.3.3.tar.gz +fd545874dff334c424337ca9d7683ff6 amanda-3.3.5.tar.gz From a2b30d774891da43fcd514b5f90f904f88f7508e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:34:06 -0500 Subject: [PATCH 054/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 271214a..2f6f588 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -468,6 +468,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 7d24a5810c48321b7a53dc9fab74658935a04647 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 10 Jul 2014 14:28:13 -0600 Subject: [PATCH 055/182] Update to 3.3.6 --- .gitignore | 1 + amanda.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 686cc8f..7410137 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.1.tar.gz /amanda-3.3.3.tar.gz /amanda-3.3.5.tar.gz +/amanda-3.3.6.tar.gz diff --git a/amanda.spec b/amanda.spec index 2f6f588..08397de 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.5 -Release: 2%{?dist} +Version: 3.3.6 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -468,6 +468,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/sources b/sources index c912d5a..0e015ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd545874dff334c424337ca9d7683ff6 amanda-3.3.5.tar.gz +99559bd84b358701cf943fcc347d8914 amanda-3.3.6.tar.gz From ac8c2be497bc0336caa2e6e8b6f25a5212287538 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 10 Jul 2014 16:08:31 -0600 Subject: [PATCH 056/182] Add ambsdtar to files --- amanda.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amanda.spec b/amanda.spec index 08397de..cb4dabf 100644 --- a/amanda.spec +++ b/amanda.spec @@ -417,6 +417,7 @@ rm -rf ${RPM_BUILD_ROOT} %files client %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 @@ -445,6 +446,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man7/amanda-applications.7* %{_mandir}/man8/amdump_client.8* %{_mandir}/man5/amanda-client.conf.5* +%{_mandir}/man8/ambsdtar.8* %{_mandir}/man8/amgtar.8* %{_mandir}/man8/ampgsql.8* %{_mandir}/man8/amraw.8* From 1c8d127f2ae2c43b41e7980ba539d27e51045d74 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Mon, 28 Jul 2014 13:00:10 +0200 Subject: [PATCH 057/182] amstatus perl script is broken due to misconfiguration of $PS (#1074216) --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index cb4dabf..51a5cdb 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -39,7 +39,7 @@ BuildRequires: gcc-c++ readline-devel BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st BuildRequires: perl-devel perl(ExtUtils::Embed) perl(Test::Simple) BuildRequires: glib2-devel openssl-devel swig bison flex -BuildRequires: libcurl-devel +BuildRequires: libcurl-devel procps-ng Requires(pre): shadow-utils Requires(post): grep sed systemd-units Requires(preun): systemd-units @@ -470,6 +470,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 3313a62b69664648c0650bc4cf3a18aa354b05fe Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 20:26:43 +0000 Subject: [PATCH 058/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 51a5cdb..0d57247 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -470,6 +470,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From 54cce2460a7ca8d6c9ba92e34f58fefa52340c25 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Aug 2014 18:51:16 +0200 Subject: [PATCH 059/182] Perl 5.20 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 0d57247..b1bd363 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -470,6 +470,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From b738709b47c0139bb9dd5568fa379aa6cf5558dc Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Wed, 3 Sep 2014 11:54:08 +0200 Subject: [PATCH 060/182] FTBFS with perl 5.20 (#1134732) --- amanda.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index b1bd363..fd193dd 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -136,6 +136,10 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie --with-bsdudp-security \ --with-krb5-security +pushd perl +make maintainer-clean-am +popd + make %{?_smp_mflags} @@ -470,6 +474,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Sep 04 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 From 926099dab9c246cf9abd646aca445082181514c5 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 Sep 2014 15:56:52 +0200 Subject: [PATCH 061/182] Perl 5.20 rebuild --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index fd193dd..3efc74f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 5%{?dist} +Release: 6%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -474,7 +474,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog -* Thu Sep 04 2014 Petr Hracek - 3.3.6-5 +* 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 From aa13c8a01819f0bbbabec27b6c5aa360aacf6f45 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 11 Nov 2014 13:54:40 +0100 Subject: [PATCH 062/182] Resolves: #1033896 Add amindexd as argument to amandad --- amanda-udp.service | 2 +- amanda.spec | 5 ++++- amanda@.service | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/amanda-udp.service b/amanda-udp.service index 1054252..e749c81 100644 --- a/amanda-udp.service +++ b/amanda-udp.service @@ -5,5 +5,5 @@ After=local-fs.target [Service] User=amandabackup Group=disk -ExecStart=/usr/sbin/amandad -auth=bsd amdump +ExecStart=/usr/sbin/amandad -auth=bsd amdump amindexd amidxtaped StandardInput=socket diff --git a/amanda.spec b/amanda.spec index 3efc74f..856ffa5 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 6%{?dist} +Release: 7%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -474,6 +474,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/amanda@.service b/amanda@.service index 24adab4..dd94de8 100644 --- a/amanda@.service +++ b/amanda@.service @@ -5,5 +5,5 @@ After=local-fs.target [Service] User=amandabackup Group=disk -ExecStart=/usr/sbin/amandad -auth=bsdtcp amdump +ExecStart=/usr/sbin/amandad -auth=bsdtcp amdump amindexd amidxtaped StandardInput=socket From 88536329c00b7c8fd7217aa0b5e25f4a2c82126d Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 21 Nov 2014 16:29:45 +0100 Subject: [PATCH 063/182] add kamanda unit files (#1077642) --- amanda-krb5.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++++ amanda.spec | 7 +++++- kamanda.socket | 9 ++++++++ kamanda@.service | 9 ++++++++ 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 amanda-krb5.patch create mode 100644 kamanda.socket create mode 100644 kamanda@.service diff --git a/amanda-krb5.patch b/amanda-krb5.patch new file mode 100644 index 0000000..f3e237a --- /dev/null +++ b/amanda-krb5.patch @@ -0,0 +1,56 @@ +diff --git a/amandad-src/amandad.c b/amandad-src/amandad.c +index d864c3f..4a899fb 100644 +--- a/amandad-src/amandad.c ++++ b/amandad-src/amandad.c +@@ -456,7 +456,7 @@ main( + } + + #ifndef SINGLE_USERID +- if (geteuid() == 0) { ++ if (getuid() == 0) { + if (strcasecmp(auth, "krb5") != 0) { + struct passwd *pwd; + /* lookup our local user name */ +diff --git a/common-src/krb5-security.c b/common-src/krb5-security.c +index c3075fa..8d3b18a 100644 +--- a/common-src/krb5-security.c ++++ b/common-src/krb5-security.c +@@ -334,6 +334,7 @@ krb5_accept( + char hostname[NI_MAXHOST]; + int result; + char *errmsg = NULL; ++ struct passwd *pw; + + krb5_init(); + +@@ -372,6 +373,12 @@ krb5_accept( + error("gss_server failed: %s\n", rc->errmsg); + rc->accept_fn = fn; + sec_tcp_conn_read(rc); ++ ++ /* totally drop privileges at this point ++ *(making the userid equal to the dumpuser) ++ */ ++ pw = getpwnam(CLIENT_LOGIN); ++ setreuid(pw->pw_uid, pw->pw_uid); + } + + /* +@@ -712,7 +719,7 @@ krb5_init(void) + beenhere = 1; + + #ifndef BROKEN_MEMORY_CCACHE +- putenv(stralloc("KRB5_ENV_CCNAME=MEMORY:amanda_ccache")); ++ putenv(stralloc(KRB5_ENV_CCNAME"=MEMORY:amanda_ccache")); + #else + /* + * MEMORY ccaches seem buggy and cause a lot of internal heap +@@ -727,7 +734,7 @@ krb5_init(void) + char *ccache; + ccache = malloc(128); + g_snprintf(ccache, SIZEOF(ccache), +- "KRB5_ENV_CCNAME=FILE:/tmp/amanda_ccache.%ld.%ld", ++ KRB5_ENV_CCNAME"=FILE:/tmp/amanda_ccache.%ld.%ld", + (long)geteuid(), (long)getpid()); + putenv(ccache); + } diff --git a/amanda.spec b/amanda.spec index 856ffa5..1699d43 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -25,6 +25,7 @@ Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch Patch11: amanda-3.3.2-autogen.patch +Patch12: amanda-krb5.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -106,6 +107,7 @@ server also needs to have the amanda-client package installed. %patch3 -p1 -b .tcpport %patch6 -p1 -b .config %patch11 -p1 -b .autogen +%patch12 -p1 -b .krb5 ./autogen %build @@ -474,6 +476,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 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 From 67f8c8f3c96f4e7246a3f66124f4f6f35b6d1494 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 21 Nov 2014 16:42:10 +0100 Subject: [PATCH 064/182] inlude unit files for systemd --- amanda.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 1699d43..4cb3ac0 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 8%{?dist} +Release: 9%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -21,6 +21,8 @@ Source11: activate-devpay.1.gz Source12: killpgrp.8 Source13: amanda-udp.socket Source14: amanda-udp.service +Source15: kamanda.socket +Source16: kamanda@.service Patch2: amanda-3.1.1-xattrs.patch Patch3: amanda-3.1.1-tcpport.patch Patch6: amanda-3.2.0-config-dir.patch @@ -158,6 +160,8 @@ 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 @@ -194,15 +198,18 @@ rm -rf ${RPM_BUILD_ROOT} /sbin/ldconfig %systemd_post amanda.socket %systemd_post amanda-udp.socket +%systemd_post kamanda.socket %preun %systemd_preun amanda.socket %systemd_preun amanda-udp.socket +%systemd_preun kamanda.socket %postun /sbin/ldconfig %systemd_postun_with_restart amanda.socket %systemd_postun_with_restart amanda-udp.socket +%systemd_postun_with_restart kamanda.socket %post client -p /sbin/ldconfig @@ -218,6 +225,8 @@ rm -rf ${RPM_BUILD_ROOT} %{_unitdir}/amanda.socket %{_unitdir}/amanda-udp.service %{_unitdir}/amanda-udp.socket +%{_unitdir}/kamanda@.service +%{_unitdir}/kamanda.socket %dir %{_libexecdir}/amanda %{_libexecdir}/amanda/amandad @@ -476,6 +485,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From b6e48b1a156dd8c068189ebc701314410be542ed Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 27 Feb 2015 13:54:55 +0100 Subject: [PATCH 065/182] Fix for swig-3.0.5 (#1195297) Signed-off-by: Petr Hracek --- amanda-swig-3.0.5.patch | 60 +++++++++++++++++++++++++++++++++++++++++ amanda.spec | 27 +++++++++++-------- 2 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 amanda-swig-3.0.5.patch diff --git a/amanda-swig-3.0.5.patch b/amanda-swig-3.0.5.patch new file mode 100644 index 0000000..cffefdd --- /dev/null +++ b/amanda-swig-3.0.5.patch @@ -0,0 +1,60 @@ +diff --git a/perl/Amanda/Xfer.swg b/perl/Amanda/Xfer.swg +index 522d61f..352c5e9 100644 +--- a/perl/Amanda/Xfer.swg ++++ b/perl/Amanda/Xfer.swg +@@ -513,16 +513,16 @@ xfer_get_amglue_source( + /* First, a few macros to generate decent Perl */ + + %define PACKAGE(PKG) +-%perlcode { ++%perlcode %{ + package PKG; +-} ++%} + %enddef + + %define XFER_ELEMENT_SUBCLASS_OF(PARENT) +-%perlcode { ++%perlcode %{ + use vars qw(@ISA); + @ISA = qw( PARENT ); +-} ++%} + %enddef + + %define XFER_ELEMENT_SUBCLASS() +@@ -530,28 +530,28 @@ XFER_ELEMENT_SUBCLASS_OF(Amanda::Xfer::Element) + %enddef + + %define DECLARE_CONSTRUCTOR(C_CONSTRUCTOR) +-%perlcode { ++%perlcode %{ + sub new { + my $pkg = shift; + # The C function adds the proper blessing -- this function + # just gets $pkg out of the way. + C_CONSTRUCTOR(@_); + } +-} ++%} + %enddef + + %define OVERLOAD_REPR() +-%perlcode { ++%perlcode %{ + use overload '""' => sub { $_[0]->repr(); }; + # overload comparison, so users can ask if one obj == another + use overload '==' => sub { Amanda::Xfer::same_elements($_[0], $_[1]); }; + use overload '!=' => sub { not Amanda::Xfer::same_elements($_[0], $_[1]); }; +-} ++%} + %enddef + + %define DECLARE_METHOD(METHOD_NAME, C_FUNCTION) +-%perlcode {*METHOD_NAME = *C_FUNCTION; +-} ++%perlcode %{*METHOD_NAME = *C_FUNCTION; ++%} + %enddef + + /* And now define the required perl classes */ diff --git a/amanda.spec b/amanda.spec index 4cb3ac0..93b81b2 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 9%{?dist} +Release: 10%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -23,11 +23,12 @@ Source13: amanda-udp.socket Source14: amanda-udp.service Source15: kamanda.socket Source16: kamanda@.service -Patch2: amanda-3.1.1-xattrs.patch -Patch3: amanda-3.1.1-tcpport.patch -Patch6: amanda-3.2.0-config-dir.patch -Patch11: amanda-3.3.2-autogen.patch -Patch12: amanda-krb5.patch +Patch1: amanda-3.1.1-xattrs.patch +Patch2: amanda-3.1.1-tcpport.patch +Patch3: amanda-3.2.0-config-dir.patch +Patch4: amanda-3.3.2-autogen.patch +Patch5: amanda-krb5.patch +Patch6: amanda-swig-3.0.5.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -105,11 +106,12 @@ server also needs to have the amanda-client package installed. %prep %setup -q -n %{name}-%{version} -%patch2 -p1 -b .xattrs -%patch3 -p1 -b .tcpport -%patch6 -p1 -b .config -%patch11 -p1 -b .autogen -%patch12 -p1 -b .krb5 +%patch1 -p1 -b .xattrs +%patch2 -p1 -b .tcpport +%patch3 -p1 -b .config +%patch4 -p1 -b .autogen +%patch5 -p1 -b .krb5 +%patch6 -p1 -b .swig-3.0.5 ./autogen %build @@ -485,6 +487,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From d8848ea8e12744997ba5867d92d932335ffb1a46 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 3 Jun 2015 15:16:13 +0200 Subject: [PATCH 066/182] Perl 5.22 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 93b81b2..e1aa4c9 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 10%{?dist} +Release: 11%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -487,6 +487,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From 7e43512b1682270c1472c3a1c5fa967e8d5fb574 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:50:19 +0000 Subject: [PATCH 067/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index e1aa4c9..3ab1b5a 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.6 -Release: 11%{?dist} +Release: 12%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -487,6 +487,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From c2fd8f98642675cdb365da18c87f061e5619737c Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Mon, 22 Jun 2015 11:51:46 +0200 Subject: [PATCH 068/182] Update to 3.3.7p1 version - fixed bug (#1225841) Signed-off-by: Petr Hracek --- .gitignore | 1 + amanda-3.3.2-autogen.patch | 10 ------- amanda-krb5.patch | 56 ----------------------------------- amanda-swig-3.0.5.patch | 60 -------------------------------------- amanda.spec | 15 +++++----- sources | 2 +- 6 files changed, 9 insertions(+), 135 deletions(-) delete mode 100644 amanda-3.3.2-autogen.patch delete mode 100644 amanda-krb5.patch delete mode 100644 amanda-swig-3.0.5.patch diff --git a/.gitignore b/.gitignore index 7410137..fcb2593 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.3.tar.gz /amanda-3.3.5.tar.gz /amanda-3.3.6.tar.gz +/amanda-3.3.7p1.tar.gz diff --git a/amanda-3.3.2-autogen.patch b/amanda-3.3.2-autogen.patch deleted file mode 100644 index e12af16..0000000 --- a/amanda-3.3.2-autogen.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/autogen b/autogen -index 1d593d8..7cb7343 100755 ---- a/autogen -+++ b/autogen -@@ -57,4 +57,4 @@ autoheader || die "autoheader failed" - touch config/config.h.in - - echo "..automake" --automake --force --copy --warnings=none || die "automake failed" -+automake --add-missing --force --copy --warnings=none || die "automake failed" diff --git a/amanda-krb5.patch b/amanda-krb5.patch deleted file mode 100644 index f3e237a..0000000 --- a/amanda-krb5.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/amandad-src/amandad.c b/amandad-src/amandad.c -index d864c3f..4a899fb 100644 ---- a/amandad-src/amandad.c -+++ b/amandad-src/amandad.c -@@ -456,7 +456,7 @@ main( - } - - #ifndef SINGLE_USERID -- if (geteuid() == 0) { -+ if (getuid() == 0) { - if (strcasecmp(auth, "krb5") != 0) { - struct passwd *pwd; - /* lookup our local user name */ -diff --git a/common-src/krb5-security.c b/common-src/krb5-security.c -index c3075fa..8d3b18a 100644 ---- a/common-src/krb5-security.c -+++ b/common-src/krb5-security.c -@@ -334,6 +334,7 @@ krb5_accept( - char hostname[NI_MAXHOST]; - int result; - char *errmsg = NULL; -+ struct passwd *pw; - - krb5_init(); - -@@ -372,6 +373,12 @@ krb5_accept( - error("gss_server failed: %s\n", rc->errmsg); - rc->accept_fn = fn; - sec_tcp_conn_read(rc); -+ -+ /* totally drop privileges at this point -+ *(making the userid equal to the dumpuser) -+ */ -+ pw = getpwnam(CLIENT_LOGIN); -+ setreuid(pw->pw_uid, pw->pw_uid); - } - - /* -@@ -712,7 +719,7 @@ krb5_init(void) - beenhere = 1; - - #ifndef BROKEN_MEMORY_CCACHE -- putenv(stralloc("KRB5_ENV_CCNAME=MEMORY:amanda_ccache")); -+ putenv(stralloc(KRB5_ENV_CCNAME"=MEMORY:amanda_ccache")); - #else - /* - * MEMORY ccaches seem buggy and cause a lot of internal heap -@@ -727,7 +734,7 @@ krb5_init(void) - char *ccache; - ccache = malloc(128); - g_snprintf(ccache, SIZEOF(ccache), -- "KRB5_ENV_CCNAME=FILE:/tmp/amanda_ccache.%ld.%ld", -+ KRB5_ENV_CCNAME"=FILE:/tmp/amanda_ccache.%ld.%ld", - (long)geteuid(), (long)getpid()); - putenv(ccache); - } diff --git a/amanda-swig-3.0.5.patch b/amanda-swig-3.0.5.patch deleted file mode 100644 index cffefdd..0000000 --- a/amanda-swig-3.0.5.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/perl/Amanda/Xfer.swg b/perl/Amanda/Xfer.swg -index 522d61f..352c5e9 100644 ---- a/perl/Amanda/Xfer.swg -+++ b/perl/Amanda/Xfer.swg -@@ -513,16 +513,16 @@ xfer_get_amglue_source( - /* First, a few macros to generate decent Perl */ - - %define PACKAGE(PKG) --%perlcode { -+%perlcode %{ - package PKG; --} -+%} - %enddef - - %define XFER_ELEMENT_SUBCLASS_OF(PARENT) --%perlcode { -+%perlcode %{ - use vars qw(@ISA); - @ISA = qw( PARENT ); --} -+%} - %enddef - - %define XFER_ELEMENT_SUBCLASS() -@@ -530,28 +530,28 @@ XFER_ELEMENT_SUBCLASS_OF(Amanda::Xfer::Element) - %enddef - - %define DECLARE_CONSTRUCTOR(C_CONSTRUCTOR) --%perlcode { -+%perlcode %{ - sub new { - my $pkg = shift; - # The C function adds the proper blessing -- this function - # just gets $pkg out of the way. - C_CONSTRUCTOR(@_); - } --} -+%} - %enddef - - %define OVERLOAD_REPR() --%perlcode { -+%perlcode %{ - use overload '""' => sub { $_[0]->repr(); }; - # overload comparison, so users can ask if one obj == another - use overload '==' => sub { Amanda::Xfer::same_elements($_[0], $_[1]); }; - use overload '!=' => sub { not Amanda::Xfer::same_elements($_[0], $_[1]); }; --} -+%} - %enddef - - %define DECLARE_METHOD(METHOD_NAME, C_FUNCTION) --%perlcode {*METHOD_NAME = *C_FUNCTION; --} -+%perlcode %{*METHOD_NAME = *C_FUNCTION; -+%} - %enddef - - /* And now define the required perl classes */ diff --git a/amanda.spec b/amanda.spec index 3ab1b5a..4d0f0b1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.6 -Release: 12%{?dist} +Version: 3.3.7p1 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -26,9 +26,6 @@ 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 -Patch4: amanda-3.3.2-autogen.patch -Patch5: amanda-krb5.patch -Patch6: amanda-swig-3.0.5.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -109,9 +106,6 @@ server also needs to have the amanda-client package installed. %patch1 -p1 -b .xattrs %patch2 -p1 -b .tcpport %patch3 -p1 -b .config -%patch4 -p1 -b .autogen -%patch5 -p1 -b .krb5 -%patch6 -p1 -b .swig-3.0.5 ./autogen %build @@ -270,6 +264,7 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Tests.pm %{perl_vendorarch}/Amanda/Util.pm %{perl_vendorarch}/Amanda/Xfer.pm +%{perl_vendorarch}/Amanda/Message.pm %{_mandir}/man5/amanda-archive-format.5* %{_mandir}/man7/amanda-compatibility.7* @@ -487,6 +482,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/sources b/sources index 0e015ca..cc47cd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99559bd84b358701cf943fcc347d8914 amanda-3.3.6.tar.gz +621d39b5a328f465fece4653c170cf7f amanda-3.3.7p1.tar.gz From 7d3df616f180541152d95c6ab7d92ffc3445e6e3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 16:08:22 +0000 Subject: [PATCH 069/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 4d0f0b1..d944a86 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.7p1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -482,6 +482,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From c6e090ceb846020b43893aaac1779faf3551a60e Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Tue, 9 Feb 2016 09:41:22 +0100 Subject: [PATCH 070/182] New upstream release amanda-3.3.8 Signed-off-by: Petr Hracek --- .gitignore | 1 + amanda.spec | 79 +++++++++++++++++++++++++++-------------------------- sources | 2 +- 3 files changed, 43 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index fcb2593..8f13bf1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.5.tar.gz /amanda-3.3.6.tar.gz /amanda-3.3.7p1.tar.gz +/amanda-3.3.8.tar.gz diff --git a/amanda.spec b/amanda.spec index d944a86..399ee66 100644 --- a/amanda.spec +++ b/amanda.spec @@ -7,30 +7,30 @@ %global _hardened_build 1 -Summary: A network-capable tape backup solution -Name: amanda -Version: 3.3.7p1 -Release: 2%{?dist} -Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz -Source1: amanda.crontab -Source4: disklist -Source8: amandahosts -Source9: amanda.socket -Source10: amanda@.service -Source11: activate-devpay.1.gz -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 +Summary: A network-capable tape backup solution +Name: amanda +Version: 3.3.8 +Release: 1%{?dist} +Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz +Source1: amanda.crontab +Source4: disklist +Source8: amandahosts +Source9: amanda.socket +Source10: amanda@.service +Source11: activate-devpay.1.gz +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 -License: BSD and GPLv3+ and GPLv2+ and GPLv2 -Group: Applications/System -URL: http://www.amanda.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +License: BSD and GPLv3+ and GPLv2+ and GPLv2 +Group: Applications/System +URL: http://www.amanda.org +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool %if 0%{?fedora} BuildRequires: dump @@ -45,10 +45,10 @@ Requires(pre): shadow-utils Requires(post): grep sed systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires: fileutils grep tar /bin/mail -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: amanda-libs%{?_isa} = %{version}-%{release} -Obsoletes: amanda-devel < 2.6.1p2-5 +Requires: fileutils grep tar /bin/mail +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: amanda-libs%{?_isa} = %{version}-%{release} +Obsoletes: amanda-devel < 2.6.1p2-5 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\) @@ -66,20 +66,20 @@ will have to install the amanda-client and/or amanda-server packages as well. %package libs -Summary: Amanda libraries -Group: Applications/System -Requires: fileutils grep +Summary: Amanda libraries +Group: Applications/System +Requires: fileutils 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 +Summary: The client component of the AMANDA tape backup system +Group: Applications/System +Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} -Requires: amanda-libs%{?_isa} = %{version}-%{release} +Requires: amanda-libs%{?_isa} = %{version}-%{release} %description client The Amanda-client package should be installed on any machine that will @@ -88,11 +88,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 +Summary: The server side of the AMANDA tape backup system +Group: Applications/System +Requires: fileutils grep Requires(pre): amanda = %{version}-%{release} -Requires: amanda-libs%{?_isa} = %{version}-%{release} +Requires: amanda-libs%{?_isa} = %{version}-%{release} %description server The amanda-server package should be installed on the AMANDA server, @@ -482,6 +482,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 diff --git a/sources b/sources index cc47cd2..d39c5b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -621d39b5a328f465fece4653c170cf7f amanda-3.3.7p1.tar.gz +2e9bb80fd177908cf9c1b010b4399455 amanda-3.3.8.tar.gz From f07a99ba9ef3d168e801e66b77df1483d50d9d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 11 Mar 2016 13:40:23 +0100 Subject: [PATCH 071/182] Do not provide private libraries --- amanda.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 399ee66..adc8ea5 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -52,6 +52,10 @@ Obsoletes: amanda-devel < 2.6.1p2-5 %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$ + %description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a backup system that allows the administrator of a LAN to set up a @@ -482,6 +486,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 6824051ecd26fa6986ed99556d7847c9b304270f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 15 May 2016 07:50:10 +0200 Subject: [PATCH 072/182] Perl 5.24 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index adc8ea5..925a705 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.8 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -486,6 +486,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From 4664536e360f90d5822b9fa2f302fc7ef95fc4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:16:46 +0200 Subject: [PATCH 073/182] Mandatory Perl build-requires added --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 925a705..3552895 100644 --- a/amanda.spec +++ b/amanda.spec @@ -38,7 +38,7 @@ BuildRequires: dump BuildRequires: 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) perl(Test::Simple) +BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simple) BuildRequires: glib2-devel openssl-devel swig bison flex BuildRequires: libcurl-devel procps-ng Requires(pre): shadow-utils From 007ffffec08a253feccd096f25a82000f5fd1a39 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 27 Jul 2016 14:30:37 +0200 Subject: [PATCH 074/182] Update to 3.3.9 --- .gitignore | 1 + amanda.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8f13bf1..4307fb2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.6.tar.gz /amanda-3.3.7p1.tar.gz /amanda-3.3.8.tar.gz +/amanda-3.3.9.tar.gz diff --git a/amanda.spec b/amanda.spec index 3552895..c3bf242 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.8 -Release: 3%{?dist} +Version: 3.3.9 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -462,6 +462,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_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* @@ -480,12 +481,16 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf +%config(noreplace) %{_sysconfdir}/amanda/amanda-security.conf %attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/amandates %attr(-,%amanda_user,%amanda_group) %{_localstatedir}/lib/amanda/gnutar-lists/ %changelog +* Wed Jul 27 2016 Josef Ridky - 3.3.9-1 +- New upstream release 3.3.9 (#1360703) + * Sun May 15 2016 Jitka Plesnikova - 3.3.8-3 - Perl 5.24 rebuild diff --git a/sources b/sources index d39c5b9..c7afea7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e9bb80fd177908cf9c1b010b4399455 amanda-3.3.8.tar.gz +51a7d55ee84d250c9d809318b0b3dcbb amanda-3.3.9.tar.gz From a320d4e2f58cd068468ac2c24bd28a45eb87be46 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 27 Jul 2016 14:36:45 +0200 Subject: [PATCH 075/182] Remove unimportant Require(pre) from .spec file --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index c3bf242..1ba9361 100644 --- a/amanda.spec +++ b/amanda.spec @@ -41,7 +41,6 @@ BuildRequires: krb5-devel rsh openssh-clients ncompress 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 procps-ng -Requires(pre): shadow-utils Requires(post): grep sed systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -490,6 +489,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * 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 From 222578a274145fd9dc6b74b3f0dcfa6424a30ce4 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 4 Aug 2016 10:24:47 +0200 Subject: [PATCH 076/182] Resolves: #1257686 - fix Tie::StdHash permission problem --- amanda-3.3.9-hash-permission.patch | 12 ++++++++++++ amanda.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 amanda-3.3.9-hash-permission.patch diff --git a/amanda-3.3.9-hash-permission.patch b/amanda-3.3.9-hash-permission.patch new file mode 100644 index 0000000..e0a399b --- /dev/null +++ b/amanda-3.3.9-hash-permission.patch @@ -0,0 +1,12 @@ +diff -urNp orig-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm new-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm +--- orig-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm 2016-02-09 23:52:47.000000000 +0100 ++++ new-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm 2016-08-04 08:56:16.560998574 +0200 +@@ -1,6 +1,7 @@ + package Amanda::Config::FoldingHash; + use Tie::Hash; +-use base 'Tie::StdHash'; ++eval {require 'Tie::StdHash';}; ++our @ISA = 'Tie::StdHash'; + use Amanda::Config; + use Amanda::Debug; + diff --git a/amanda.spec b/amanda.spec index 1ba9361..e69732c 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -26,6 +26,8 @@ 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 +#Bugfix - solved problem with permission error message (#1257686) +Patch4: amanda-3.3.9-hash-permission.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -109,6 +111,7 @@ server also needs to have the amanda-client package installed. %patch1 -p1 -b .xattrs %patch2 -p1 -b .tcpport %patch3 -p1 -b .config +%patch4 -p1 -b .hash-permission ./autogen %build @@ -487,6 +490,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From 7c14a949be85a8591e6214d7d575e501f93e74e0 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 18 Aug 2016 09:16:30 +0200 Subject: [PATCH 077/182] Resolves: #1368021 - added missing amanda-security.conf file into /etc folder --- amanda.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/amanda.spec b/amanda.spec index e69732c..86f1f69 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.3.9 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -166,7 +166,7 @@ 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 @@ -460,6 +460,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/amdump_client %{_sbindir}/amoldrecover %{_sbindir}/amrecover +%{_sysconfdir}/amanda/amanda-security.conf %{_mandir}/man7/amanda-applications.7* %{_mandir}/man8/amdump_client.8* @@ -483,13 +484,16 @@ rm -rf ${RPM_BUILD_ROOT} %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf -%config(noreplace) %{_sysconfdir}/amanda/amanda-security.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 %changelog +* 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) From 390416daab3d94b7e3aacfc045e3b5e3dfc320d3 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 20 Oct 2016 09:30:46 +0200 Subject: [PATCH 078/182] New version is available - amanda-3.4 --- .gitignore | 1 + amanda-3.3.9-hash-permission.patch | 11 +++--- amanda.spec | 57 +++++++++++++++++++++++++----- sources | 2 +- 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 4307fb2..fffdcce 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.7p1.tar.gz /amanda-3.3.8.tar.gz /amanda-3.3.9.tar.gz +/amanda-3.4.tar.gz diff --git a/amanda-3.3.9-hash-permission.patch b/amanda-3.3.9-hash-permission.patch index e0a399b..3612aa4 100644 --- a/amanda-3.3.9-hash-permission.patch +++ b/amanda-3.3.9-hash-permission.patch @@ -1,12 +1,13 @@ -diff -urNp orig-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm new-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm ---- orig-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm 2016-02-09 23:52:47.000000000 +0100 -+++ new-amanda-3.3.9/perl/Amanda/Config/FoldingHash.pm 2016-08-04 08:56:16.560998574 +0200 +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'; - use Amanda::Config; - use Amanda::Debug; + require Amanda::Config; + require Amanda::Debug; diff --git a/amanda.spec b/amanda.spec index 86f1f69..f8f8784 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.3.9 -Release: 3%{?dist} +Version: 3.4 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -57,7 +57,7 @@ Obsoletes: amanda-devel < 2.6.1p2-5 # feature, bug #1309664 %global __provides_exclude_from %{?__provides_exclude_from:%{__provides_exclude_from}|}^%{perl_vendorarch}/auto/.*\\.so$ -%description +%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 @@ -250,6 +250,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/amgetconf %{_sbindir}/amgpgcrypt %{_sbindir}/amplot +%{_sbindir}/amssl %{perl_vendorarch}/Amanda/Archive.pm %{perl_vendorarch}/Amanda/BigIntCompat.pm @@ -271,6 +272,12 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Util.pm %{perl_vendorarch}/Amanda/Xfer.pm %{perl_vendorarch}/Amanda/Message.pm +%{perl_vendorarch}/Amanda/Amservice.pm +%{perl_vendorarch}/Amanda/FetchDump.pm +%{perl_vendorarch}/Amanda/FetchDump/ +%{perl_vendorarch}/Amanda/Recovery.pm +%{perl_vendorarch}/Amanda/Restore.pm +%{perl_vendorarch}/Amanda/Service.pm %{_mandir}/man5/amanda-archive-format.5* %{_mandir}/man7/amanda-compatibility.7* @@ -290,6 +297,8 @@ rm -rf ${RPM_BUILD_ROOT} %{_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 @@ -328,6 +337,7 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/auto/Amanda/Logfile/ %{perl_vendorarch}/auto/Amanda/Tapelist/ %{perl_vendorarch}/auto/Amanda/XferServer/ +%{perl_vendorarch}/auto/Amanda/Cmdfile/ %files server %{_libexecdir}/amanda/amdumpd @@ -338,15 +348,14 @@ rm -rf ${RPM_BUILD_ROOT} %{_libexecdir}/amanda/amtrmidx %{_libexecdir}/amanda/amtrmlog %{_libexecdir}/amanda/driver +%{_libexecdir}/amanda/amadmin_perl +%{_libexecdir}/amanda/ambackupd +%{_libexecdir}/amanda/rest-server/ %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper -%{_libexecdir}/amanda/chg-disk -%{_libexecdir}/amanda/chg-lib.sh -%{_libexecdir}/amanda/chg-manual -%{_libexecdir}/amanda/chg-multi -%{_libexecdir}/amanda/chg-zd-mtx %{_libexecdir}/amanda/chunker %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner %{_libexecdir}/amanda/taper + %{_sbindir}/activate-devpay %{_sbindir}/amaddclient %{_sbindir}/amadmin @@ -371,9 +380,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/amtapetype %{_sbindir}/amtoc %{_sbindir}/amvault +%{_sbindir}/amanda-rest-server +%{_sbindir}/amreindex %{_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* @@ -400,6 +412,8 @@ rm -rf ${RPM_BUILD_ROOT} %{_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* %{perl_vendorarch}/Amanda/Cmdline.pm @@ -422,6 +436,21 @@ rm -rf ${RPM_BUILD_ROOT} %{perl_vendorarch}/Amanda/Tapelist.pm %{perl_vendorarch}/Amanda/Taper/ %{perl_vendorarch}/Amanda/XferServer.pm +%{perl_vendorarch}/Amanda/Amdump.pm +%{perl_vendorarch}/Amanda/Amflush.pm +%{perl_vendorarch}/Amanda/CheckDump.pm +%{perl_vendorarch}/Amanda/Chunker/ +%{perl_vendorarch}/Amanda/Cleanup.pm +%{perl_vendorarch}/Amanda/Cmdfile.pm +%{perl_vendorarch}/Amanda/DB.pm +%{perl_vendorarch}/Amanda/Index.pm +%{perl_vendorarch}/Amanda/Label.pm +%{perl_vendorarch}/Amanda/Policy.pm +%{perl_vendorarch}/Amanda/Rest/ +%{perl_vendorarch}/Amanda/Service/Amidxtaped.pm +%{perl_vendorarch}/Amanda/Status.pm +%{perl_vendorarch}/Amanda/Storage.pm +%{perl_vendorarch}/Amanda/Vault.pm %config(noreplace) %{_sysconfdir}/amanda/crontab.sample %config(noreplace) %{_sysconfdir}/amanda/%defconfig/* @@ -446,6 +475,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_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 @@ -457,9 +490,12 @@ rm -rf ${RPM_BUILD_ROOT} %{_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* @@ -478,9 +514,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/amzfs-sendrecv.8* %{_mandir}/man8/amzfs-snapshot.8* %{_mandir}/man8/killpgrp.8* +%{_mandir}/man8/ambackup.8.* %{perl_vendorarch}/Amanda/Application.pm %{perl_vendorarch}/Amanda/Application/ +%{perl_vendorarch}/Amanda/Service/Restore.pm %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf @@ -491,6 +529,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) diff --git a/sources b/sources index c7afea7..6068466 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51a7d55ee84d250c9d809318b0b3dcbb amanda-3.3.9.tar.gz +2ba93de7262b73439e5f51be57b2c3a1 amanda-3.4.tar.gz From cc2adb3f63f9740eb5ceda0073e32c2cde894b7d Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Mon, 24 Oct 2016 10:15:37 +0200 Subject: [PATCH 079/182] Add requires for server --- amanda.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/amanda.spec b/amanda.spec index f8f8784..64c36d6 100644 --- a/amanda.spec +++ b/amanda.spec @@ -96,6 +96,7 @@ AMANDA client machine. Summary: The server side of the AMANDA tape backup system Group: Applications/System Requires: fileutils grep +Requires: perl(Amanda::DB) perl(Amanda::Recovery) perl(Amanda::Service) Requires(pre): amanda = %{version}-%{release} Requires: amanda-libs%{?_isa} = %{version}-%{release} From 625f5cbeb85e49750bab7b286fb42457e31d43c6 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Mon, 24 Oct 2016 11:54:07 +0200 Subject: [PATCH 080/182] Fix NVR in spec file --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 64c36d6..46241f1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -530,6 +530,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From f2a7583acc37338612ebad9f2ff8f18febe3a337 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 26 Oct 2016 12:38:17 +0200 Subject: [PATCH 081/182] Fix broken dependencies in version 3.4 --- amanda-3.4-fix-dependencies.diff | 38 ++++++++++++++++++++++++++++++++ amanda.spec | 6 +++++ 2 files changed, 44 insertions(+) create mode 100644 amanda-3.4-fix-dependencies.diff diff --git a/amanda-3.4-fix-dependencies.diff b/amanda-3.4-fix-dependencies.diff new file mode 100644 index 0000000..0606673 --- /dev/null +++ b/amanda-3.4-fix-dependencies.diff @@ -0,0 +1,38 @@ +diff --git a/perl/Amanda/DB.pm b/perl/Amanda/DB.pm +index 4a1aaec..29b6acf 100644 +--- a/perl/Amanda/DB.pm ++++ b/perl/Amanda/DB.pm +@@ -18,6 +18,8 @@ + # Contact information: Zmanda Inc, 505 N Mathlida Ave, Suite 120 + # Sunnyvale, CA 94085, or: http://www.zmanda.com + ++package Amanda::DB; ++ + package Amanda::DB::Message; + use strict; + use warnings; +diff --git a/perl/Amanda/Recovery.pm b/perl/Amanda/Recovery.pm +index 33fb43b..cf43334 100644 +--- a/perl/Amanda/Recovery.pm ++++ b/perl/Amanda/Recovery.pm +@@ -18,6 +18,8 @@ + # Contact information: Carbonite Inc., 756 N Pastoria Ave + # Sunnyvale, CA 94085, or: http://www.zmanda.com + ++package Amanda::Recovery; ++ + package Amanda::Recovery::Message; + use strict; + use warnings; +diff --git a/perl/Amanda/Service.pm b/perl/Amanda/Service.pm +index 09d8c56..24a773e 100644 +--- a/perl/Amanda/Service.pm ++++ b/perl/Amanda/Service.pm +@@ -17,6 +17,7 @@ + # Contact information: Carbonite Inc., 756 N Pastoria Ave + # Sunnyvale, CA 94085, or: http://www.zmanda.com + ++package Amanda::Service; + + package Amanda::Service::Message; + use strict; diff --git a/amanda.spec b/amanda.spec index 46241f1..ed37d02 100644 --- a/amanda.spec +++ b/amanda.spec @@ -28,6 +28,8 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch #Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch +#Fix broken dependencies in amanda-3.4 +Patch5: amanda-3.4-fix-dependencies.diff License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -113,6 +115,7 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .tcpport %patch3 -p1 -b .config %patch4 -p1 -b .hash-permission +%patch5 -p1 -b .fix-dependencies ./autogen %build @@ -530,6 +533,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From ab78dba614d99e51562f58597be1bb39a32a5de7 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 26 Oct 2016 12:42:13 +0200 Subject: [PATCH 082/182] Bump NVR to 3.4-3 --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index ed37d02..b6fb1ce 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist From 960fefa2efb14cc2a005208df9509c5b212724f1 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 10 Nov 2016 09:25:27 +0100 Subject: [PATCH 083/182] Optimalize amanda spec file for package dependencies --- amanda.spec | 92 ++++------------------------------------------------- 1 file changed, 6 insertions(+), 86 deletions(-) diff --git a/amanda.spec b/amanda.spec index b6fb1ce..c7df39f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -256,32 +256,8 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/amplot %{_sbindir}/amssl -%{perl_vendorarch}/Amanda/Archive.pm -%{perl_vendorarch}/Amanda/BigIntCompat.pm -%{perl_vendorarch}/Amanda/ClientService.pm -%{perl_vendorarch}/Amanda/Config.pm -%{perl_vendorarch}/Amanda/Config/ -%{perl_vendorarch}/Amanda/Constants.pm -%{perl_vendorarch}/Amanda/Debug.pm -%{perl_vendorarch}/Amanda/Feature.pm -%{perl_vendorarch}/Amanda/Header.pm -%{perl_vendorarch}/Amanda/IPC -%{perl_vendorarch}/Amanda/MainLoop.pm -%{perl_vendorarch}/Amanda/NDMP.pm -%{perl_vendorarch}/Amanda/Paths.pm -%{perl_vendorarch}/Amanda/Process.pm -%{perl_vendorarch}/Amanda/Script_App.pm -%{perl_vendorarch}/Amanda/Script.pm -%{perl_vendorarch}/Amanda/Tests.pm -%{perl_vendorarch}/Amanda/Util.pm -%{perl_vendorarch}/Amanda/Xfer.pm -%{perl_vendorarch}/Amanda/Message.pm -%{perl_vendorarch}/Amanda/Amservice.pm -%{perl_vendorarch}/Amanda/FetchDump.pm -%{perl_vendorarch}/Amanda/FetchDump/ -%{perl_vendorarch}/Amanda/Recovery.pm -%{perl_vendorarch}/Amanda/Restore.pm -%{perl_vendorarch}/Amanda/Service.pm +%{perl_vendorarch}/Amanda/ +%{perl_vendorarch}/auto/Amanda/ %{_mandir}/man5/amanda-archive-format.5* %{_mandir}/man7/amanda-compatibility.7* @@ -323,25 +299,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libamxfer*.so %{_libdir}/libndmjob*.so %{_libdir}/libndmlib*.so -%{perl_vendorarch}/auto/Amanda/Application/ -%{perl_vendorarch}/auto/Amanda/Archive/ -%{perl_vendorarch}/auto/Amanda/Config/ -%{perl_vendorarch}/auto/Amanda/Debug/ -%{perl_vendorarch}/auto/Amanda/Feature/ -%{perl_vendorarch}/auto/Amanda/Header/ -%{perl_vendorarch}/auto/Amanda/IPC/ -%{perl_vendorarch}/auto/Amanda/MainLoop/ -%{perl_vendorarch}/auto/Amanda/NDMP/ -%{perl_vendorarch}/auto/Amanda/Tests/ -%{perl_vendorarch}/auto/Amanda/Util/ -%{perl_vendorarch}/auto/Amanda/Xfer/ -%{perl_vendorarch}/auto/Amanda/Cmdline/ -%{perl_vendorarch}/auto/Amanda/Device/ -%{perl_vendorarch}/auto/Amanda/Disklist/ -%{perl_vendorarch}/auto/Amanda/Logfile/ -%{perl_vendorarch}/auto/Amanda/Tapelist/ -%{perl_vendorarch}/auto/Amanda/XferServer/ -%{perl_vendorarch}/auto/Amanda/Cmdfile/ %files server %{_libexecdir}/amanda/amdumpd @@ -420,42 +377,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/amreindex.8.* %{_mandir}/man1/activate-devpay.1* -%{perl_vendorarch}/Amanda/Cmdline.pm -%{perl_vendorarch}/Amanda/Curinfo/ -%{perl_vendorarch}/Amanda/Curinfo.pm -%{perl_vendorarch}/Amanda/DB/ -%{perl_vendorarch}/Amanda/Device.pm -%{perl_vendorarch}/Amanda/Disklist.pm -%{perl_vendorarch}/Amanda/Extract.pm -%{perl_vendorarch}/Amanda/Holding.pm -%{perl_vendorarch}/Amanda/Changer/ -%{perl_vendorarch}/Amanda/Changer.pm -%{perl_vendorarch}/Amanda/Interactivity/ -%{perl_vendorarch}/Amanda/Interactivity.pm -%{perl_vendorarch}/Amanda/Logfile.pm -%{perl_vendorarch}/Amanda/Recovery/ -%{perl_vendorarch}/Amanda/Report/ -%{perl_vendorarch}/Amanda/Report.pm -%{perl_vendorarch}/Amanda/ScanInventory.pm -%{perl_vendorarch}/Amanda/Tapelist.pm -%{perl_vendorarch}/Amanda/Taper/ -%{perl_vendorarch}/Amanda/XferServer.pm -%{perl_vendorarch}/Amanda/Amdump.pm -%{perl_vendorarch}/Amanda/Amflush.pm -%{perl_vendorarch}/Amanda/CheckDump.pm -%{perl_vendorarch}/Amanda/Chunker/ -%{perl_vendorarch}/Amanda/Cleanup.pm -%{perl_vendorarch}/Amanda/Cmdfile.pm -%{perl_vendorarch}/Amanda/DB.pm -%{perl_vendorarch}/Amanda/Index.pm -%{perl_vendorarch}/Amanda/Label.pm -%{perl_vendorarch}/Amanda/Policy.pm -%{perl_vendorarch}/Amanda/Rest/ -%{perl_vendorarch}/Amanda/Service/Amidxtaped.pm -%{perl_vendorarch}/Amanda/Status.pm -%{perl_vendorarch}/Amanda/Storage.pm -%{perl_vendorarch}/Amanda/Vault.pm - %config(noreplace) %{_sysconfdir}/amanda/crontab.sample %config(noreplace) %{_sysconfdir}/amanda/%defconfig/* %exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf @@ -520,10 +441,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/killpgrp.8* %{_mandir}/man8/ambackup.8.* -%{perl_vendorarch}/Amanda/Application.pm -%{perl_vendorarch}/Amanda/Application/ -%{perl_vendorarch}/Amanda/Service/Restore.pm - %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf @@ -533,6 +450,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From fd488e4b21a667c03651ada88a9890cd0399e62b Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 16 Nov 2016 10:59:37 +0100 Subject: [PATCH 084/182] Add BuildRequires dependency for dump and xfsdump (#1395445) --- amanda.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/amanda.spec b/amanda.spec index c7df39f..2991112 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -36,9 +36,7 @@ Group: Applications/System URL: http://www.amanda.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool -%if 0%{?fedora} -BuildRequires: dump -%endif +BuildRequires: dump xfsdump BuildRequires: gnuplot cups samba-client tar grep fileutils BuildRequires: gcc-c++ readline-devel BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st @@ -450,6 +448,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From b05d0d2cb58135e0f3879b42932c66350adf4001 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 7 Dec 2016 08:29:36 +0100 Subject: [PATCH 085/182] New upstream release 3.4.1 --- .gitignore | 1 + amanda-3.4-fix-dependencies.diff | 38 -------------------------------- amanda.spec | 10 ++++----- sources | 2 +- 4 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 amanda-3.4-fix-dependencies.diff diff --git a/.gitignore b/.gitignore index fffdcce..7cb3865 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ amanda-3.1.1.tar.gz /amanda-3.3.8.tar.gz /amanda-3.3.9.tar.gz /amanda-3.4.tar.gz +/amanda-3.4.1.tar.gz diff --git a/amanda-3.4-fix-dependencies.diff b/amanda-3.4-fix-dependencies.diff deleted file mode 100644 index 0606673..0000000 --- a/amanda-3.4-fix-dependencies.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/perl/Amanda/DB.pm b/perl/Amanda/DB.pm -index 4a1aaec..29b6acf 100644 ---- a/perl/Amanda/DB.pm -+++ b/perl/Amanda/DB.pm -@@ -18,6 +18,8 @@ - # Contact information: Zmanda Inc, 505 N Mathlida Ave, Suite 120 - # Sunnyvale, CA 94085, or: http://www.zmanda.com - -+package Amanda::DB; -+ - package Amanda::DB::Message; - use strict; - use warnings; -diff --git a/perl/Amanda/Recovery.pm b/perl/Amanda/Recovery.pm -index 33fb43b..cf43334 100644 ---- a/perl/Amanda/Recovery.pm -+++ b/perl/Amanda/Recovery.pm -@@ -18,6 +18,8 @@ - # Contact information: Carbonite Inc., 756 N Pastoria Ave - # Sunnyvale, CA 94085, or: http://www.zmanda.com - -+package Amanda::Recovery; -+ - package Amanda::Recovery::Message; - use strict; - use warnings; -diff --git a/perl/Amanda/Service.pm b/perl/Amanda/Service.pm -index 09d8c56..24a773e 100644 ---- a/perl/Amanda/Service.pm -+++ b/perl/Amanda/Service.pm -@@ -17,6 +17,7 @@ - # Contact information: Carbonite Inc., 756 N Pastoria Ave - # Sunnyvale, CA 94085, or: http://www.zmanda.com - -+package Amanda::Service; - - package Amanda::Service::Message; - use strict; diff --git a/amanda.spec b/amanda.spec index 2991112..c1f424b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.4 -Release: 5%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,8 +28,6 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch #Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch -#Fix broken dependencies in amanda-3.4 -Patch5: amanda-3.4-fix-dependencies.diff License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -113,7 +111,6 @@ server also needs to have the amanda-client package installed. %patch2 -p1 -b .tcpport %patch3 -p1 -b .config %patch4 -p1 -b .hash-permission -%patch5 -p1 -b .fix-dependencies ./autogen %build @@ -448,6 +445,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) diff --git a/sources b/sources index 6068466..4714be9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ba93de7262b73439e5f51be57b2c3a1 amanda-3.4.tar.gz +280304272c056813e127f6d2a1b2d0ed amanda-3.4.1.tar.gz From 7f7810a409eccaf478c0fb3c0d41c7fe92895b4e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jan 2017 17:30:23 +0100 Subject: [PATCH 086/182] Rebuild for readline 7.x Signed-off-by: Igor Gnatenko --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index c1f424b..3458cc5 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -445,6 +445,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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) From 6bcf790db825201074d5037fd7ccd265ad6e8c8c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Fri, 13 Jan 2017 14:41:35 -0600 Subject: [PATCH 087/182] Add patch to avoid breakage with RHEL5 clients. --- amanda-3.4.1-support-old-clients.patch | 16 ++++++++++++++++ amanda.spec | 14 +++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 amanda-3.4.1-support-old-clients.patch diff --git a/amanda-3.4.1-support-old-clients.patch b/amanda-3.4.1-support-old-clients.patch new file mode 100644 index 0000000..9d95bf9 --- /dev/null +++ b/amanda-3.4.1-support-old-clients.patch @@ -0,0 +1,16 @@ +diff --git a/server-src/diskfile.c b/server-src/diskfile.c +index ffee14e..929c05e 100644 +--- a/server-src/diskfile.c ++++ b/server-src/diskfile.c +@@ -1178,6 +1178,11 @@ char *optionstr(disk_t *dp) + g_assert(dp != NULL); + g_assert(dp->host != NULL); + ++ /* An empty element at the beginning ensures that the final options string ++ * begins with a semicolon. This helps to prevent breakage when talking to ++ * very old clients. */ ++ g_ptr_array_add(array, g_strdup("")); ++ + their_features = dp->host->features; + + if (am_has_feature(their_features, fe_options_auth)) diff --git a/amanda.spec b/amanda.spec index 3458cc5..d3d45f4 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,6 +28,7 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch #Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch +Patch5: amanda-3.4.1-support-old-clients.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -106,11 +107,7 @@ 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. %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 -b .xattrs -%patch2 -p1 -b .tcpport -%patch3 -p1 -b .config -%patch4 -p1 -b .hash-permission +%autosetup -p1 -n %{name}-%{version} ./autogen %build @@ -140,7 +137,7 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie --with-bsdtcp-security \ --with-bsdudp-security \ --with-krb5-security - + pushd perl make maintainer-clean-am popd @@ -445,6 +442,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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 From 4ad0922f30b8f485ec83be266e8d75317403339c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sun, 15 Jan 2017 12:08:47 -0600 Subject: [PATCH 088/182] Update patch with an additional fix for legacy clients. --- amanda-3.4.1-support-old-clients.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/amanda-3.4.1-support-old-clients.patch b/amanda-3.4.1-support-old-clients.patch index 9d95bf9..332f302 100644 --- a/amanda-3.4.1-support-old-clients.patch +++ b/amanda-3.4.1-support-old-clients.patch @@ -14,3 +14,16 @@ index ffee14e..929c05e 100644 their_features = dp->host->features; if (am_has_feature(their_features, fe_options_auth)) +diff --git a/server-src/dumper.c b/server-src/dumper.c +index 0e31e50..78545a8 100644 +--- a/server-src/dumper.c ++++ b/server-src/dumper.c +@@ -3685,7 +3685,7 @@ startup_dump( + g_string_append(reqbuf, pclean); + g_free(pclean); + dle_str = p; +- } else if (legacy_api) { ++ } else if (!legacy_api) { + g_free(errstr); + errstr = g_strdup("[does not support application-api]"); + g_string_free(reqbuf, TRUE); From c1bf481034b0b167857f22207777b623fa7790e5 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Tue, 31 Jan 2017 11:05:12 +0100 Subject: [PATCH 089/182] Resolves: #1417828 - fix warning with checking return value from setreuid --- amanda-3.4.1-krb5-security.patch | 15 +++++++++++++++ amanda.spec | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 amanda-3.4.1-krb5-security.patch diff --git a/amanda-3.4.1-krb5-security.patch b/amanda-3.4.1-krb5-security.patch new file mode 100644 index 0000000..0cdcd6f --- /dev/null +++ b/amanda-3.4.1-krb5-security.patch @@ -0,0 +1,15 @@ +diff -urNp old/common-src/krb5-security.c new/common-src/krb5-security.c +--- old/common-src/krb5-security.c 2017-01-31 11:00:37.371830373 +0100 ++++ new/common-src/krb5-security.c 2017-01-31 11:02:47.386259381 +0100 +@@ -390,7 +390,10 @@ krb5_accept( + *(making the userid equal to the dumpuser) + */ + pw = getpwnam(CLIENT_LOGIN); +- setreuid(pw->pw_uid, pw->pw_uid); ++ if(setreuid(pw->pw_uid, pw->pw_uid) == -1) { ++ g_critical("setreuid failed: %s", srterror(errno)); ++ exit(1); ++ } + } + + /* diff --git a/amanda.spec b/amanda.spec index d3d45f4..f2d1e7e 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -29,6 +29,7 @@ Patch3: amanda-3.2.0-config-dir.patch #Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch Patch5: amanda-3.4.1-support-old-clients.patch +Patch6: amanda-3.4.1-krb5-security.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -442,6 +443,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* 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. From 0281fe287ee5302a0cefe02b84cb261368947277 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Tue, 31 Jan 2017 11:17:46 +0100 Subject: [PATCH 090/182] Fix typo in krb5-security.patch --- amanda-3.4.1-krb5-security.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda-3.4.1-krb5-security.patch b/amanda-3.4.1-krb5-security.patch index 0cdcd6f..95b414b 100644 --- a/amanda-3.4.1-krb5-security.patch +++ b/amanda-3.4.1-krb5-security.patch @@ -7,7 +7,7 @@ diff -urNp old/common-src/krb5-security.c new/common-src/krb5-security.c pw = getpwnam(CLIENT_LOGIN); - setreuid(pw->pw_uid, pw->pw_uid); + if(setreuid(pw->pw_uid, pw->pw_uid) == -1) { -+ g_critical("setreuid failed: %s", srterror(errno)); ++ g_critical("setreuid failed: %s", strerror(errno)); + exit(1); + } } From 8c1951bd673b0df2137da4a0f6f1439c585bbfe2 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 31 Jan 2017 11:21:36 -0600 Subject: [PATCH 091/182] Clean up .gitignore. --- .gitignore | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 7cb3865..2d11c9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,5 @@ -amanda-3.1.0.tar.gz -amanda-3.1.1.tar.gz -/amanda-3.1.2.tar.gz -/amanda-3.1.3.tar.gz -/amanda-3.2.0.tar.gz -/amanda-3.2.1.tar.gz -/amanda-3.2.2.tar.gz -/amanda-3.3.0beta1.tar.gz -/amanda-3.3.0.tar.gz -/amanda-3.3.1.tar.gz -/amanda-3.3.3.tar.gz -/amanda-3.3.5.tar.gz -/amanda-3.3.6.tar.gz -/amanda-3.3.7p1.tar.gz -/amanda-3.3.8.tar.gz -/amanda-3.3.9.tar.gz +results_amanda/ +amanda-*.*.*/ /amanda-3.4.tar.gz /amanda-3.4.1.tar.gz +/amanda-3.4.2.tar.gz From ef96290de5fe8a47321dc6c7199e071b7f13eea1 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 31 Jan 2017 11:22:11 -0600 Subject: [PATCH 092/182] Update to 3.4.2 Update to 3.4.2. Remove upstreamed patch. Move autogen call from %%prep to %%build. --- amanda-3.4.1-support-old-clients.patch | 29 -------------------------- amanda.spec | 14 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 amanda-3.4.1-support-old-clients.patch diff --git a/amanda-3.4.1-support-old-clients.patch b/amanda-3.4.1-support-old-clients.patch deleted file mode 100644 index 332f302..0000000 --- a/amanda-3.4.1-support-old-clients.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/server-src/diskfile.c b/server-src/diskfile.c -index ffee14e..929c05e 100644 ---- a/server-src/diskfile.c -+++ b/server-src/diskfile.c -@@ -1178,6 +1178,11 @@ char *optionstr(disk_t *dp) - g_assert(dp != NULL); - g_assert(dp->host != NULL); - -+ /* An empty element at the beginning ensures that the final options string -+ * begins with a semicolon. This helps to prevent breakage when talking to -+ * very old clients. */ -+ g_ptr_array_add(array, g_strdup("")); -+ - their_features = dp->host->features; - - if (am_has_feature(their_features, fe_options_auth)) -diff --git a/server-src/dumper.c b/server-src/dumper.c -index 0e31e50..78545a8 100644 ---- a/server-src/dumper.c -+++ b/server-src/dumper.c -@@ -3685,7 +3685,7 @@ startup_dump( - g_string_append(reqbuf, pclean); - g_free(pclean); - dle_str = p; -- } else if (legacy_api) { -+ } else if (!legacy_api) { - g_free(errstr); - errstr = g_strdup("[does not support application-api]"); - g_string_free(reqbuf, TRUE); diff --git a/amanda.spec b/amanda.spec index d3d45f4..9efd50e 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.4.1 -Release: 3%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,7 +28,6 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch #Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch -Patch5: amanda-3.4.1-support-old-clients.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -108,11 +107,11 @@ server also needs to have the amanda-client package installed. %prep %autosetup -p1 -n %{name}-%{version} -./autogen %build -export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie +./autogen +export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie %configure --enable-shared \ --disable-rpath \ --disable-static \ @@ -442,6 +441,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Jan 31 2017 Jason L Tibbitts III - 3.4.2-1 +- Update to 3.4.2. +- Remove upstreamed patch. +- Move autogen call from %%prep to %%build. + * Fri Jan 13 2017 Jason L Tibbitts III - 3.4.1-3 - Add patch to avoid breakage with RHEL5 clients. diff --git a/sources b/sources index 4714be9..285bc00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -280304272c056813e127f6d2a1b2d0ed amanda-3.4.1.tar.gz +SHA512 (amanda-3.4.2.tar.gz) = dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd From 3ee6626eb3efb8beb6f188397acccae30ff174aa Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 31 Jan 2017 12:46:22 -0600 Subject: [PATCH 093/182] Fix build on non-x86. Minor spec cleanups. --- amanda.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/amanda.spec b/amanda.spec index ae4a5b6..eb63f1b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -28,6 +28,9 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch #Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch +# Fails to build on non-x86 due to sse-related things. Reported upstream to +# amanda-hackers on 2017-01-31. +Patch5: amanda-3.4.2-fix-sse.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -145,8 +148,6 @@ make %{?_smp_mflags} %install -rm -rf ${RPM_BUILD_ROOT} - make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/amanda @@ -183,9 +184,6 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm %check make check -%clean -rm -rf ${RPM_BUILD_ROOT} - %pre /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 || : @@ -217,7 +215,8 @@ rm -rf ${RPM_BUILD_ROOT} %postun server -p /sbin/ldconfig %files -%doc COPYRIGHT* NEWS README +%license COPYRIGHT +%doc NEWS README %{_unitdir}/amanda@.service %{_unitdir}/amanda.socket %{_unitdir}/amanda-udp.service @@ -444,7 +443,10 @@ rm -rf ${RPM_BUILD_ROOT} * 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) From 3542c2ebda9f5d685e66e16e2fefc2195deafb4e Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 31 Jan 2017 12:47:38 -0600 Subject: [PATCH 094/182] Don't forget the new patch.... --- amanda-3.4.2-fix-sse.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 amanda-3.4.2-fix-sse.patch diff --git a/amanda-3.4.2-fix-sse.patch b/amanda-3.4.2-fix-sse.patch new file mode 100644 index 0000000..6cfdfcf --- /dev/null +++ b/amanda-3.4.2-fix-sse.patch @@ -0,0 +1,14 @@ +diff --git a/common-src/amutil.c b/common-src/amutil.c +index b46ad77..4b356d6 100644 +--- a/common-src/amutil.c ++++ b/common-src/amutil.c +@@ -1904,6 +1904,9 @@ static int get_sse42(void) + #endif + return (ecx >> 20) & 1; + } ++#else /* if defined __x86_64__ || defined __i386__ ... */ ++static int get_sse42(void) { ++} + #endif + + static uint32_t crc_table[16][256]; From c5b0cc501b224ad59d1d9de2af816da4788b4e99 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 31 Jan 2017 12:52:47 -0600 Subject: [PATCH 095/182] Use upstream's patch for non-x86 instead of mine. --- amanda-3.4.2-fix-sse.patch | 10 ++++++---- amanda.spec | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/amanda-3.4.2-fix-sse.patch b/amanda-3.4.2-fix-sse.patch index 6cfdfcf..6b58323 100644 --- a/amanda-3.4.2-fix-sse.patch +++ b/amanda-3.4.2-fix-sse.patch @@ -1,13 +1,15 @@ diff --git a/common-src/amutil.c b/common-src/amutil.c -index b46ad77..4b356d6 100644 +index 864d78f..25d9fca 100644 --- a/common-src/amutil.c +++ b/common-src/amutil.c -@@ -1904,6 +1904,9 @@ static int get_sse42(void) +@@ -2096,6 +2096,11 @@ static int get_sse42(void) #endif return (ecx >> 20) & 1; } -+#else /* if defined __x86_64__ || defined __i386__ ... */ -+static int get_sse42(void) { ++#else ++static int get_sse42(void) ++{ ++ return 0; +} #endif diff --git a/amanda.spec b/amanda.spec index eb63f1b..9d5182c 100644 --- a/amanda.spec +++ b/amanda.spec @@ -28,8 +28,8 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch #Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch -# Fails to build on non-x86 due to sse-related things. Reported upstream to -# amanda-hackers on 2017-01-31. +# Fails to build on non-x86 due to sse-related things. This patch comes from +# upstream. Patch5: amanda-3.4.2-fix-sse.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 From 8b8c8eba7bb70f7c3b62818862dfa6a27e4da827 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:55:08 +0000 Subject: [PATCH 096/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 9d5182c..8659c72 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -440,6 +440,9 @@ make check %changelog +* 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. From e40bd3d2a041c1a7987e742995fab1c0a87ef434 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 20 Feb 2017 13:01:21 -0600 Subject: [PATCH 097/182] Add patch to fix a potential planner segfault. --- amanda-3.4.2-planner-segfault.patch | 12 ++++++++++++ amanda.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 amanda-3.4.2-planner-segfault.patch diff --git a/amanda-3.4.2-planner-segfault.patch b/amanda-3.4.2-planner-segfault.patch new file mode 100644 index 0000000..a2743ef --- /dev/null +++ b/amanda-3.4.2-planner-segfault.patch @@ -0,0 +1,12 @@ +--- a/server-src/tapefile.c ++++ a/server-src/tapefile.c +@@ -1199,8 +1199,7 @@ nb_tape_in_storage( + int nb_tapes = 0; + + for (tp = tape_list; tp != NULL; tp = tp->next) { +- if (tp->storage && +- g_str_equal(storage_name, tp->storage)) { ++ if (g_strcmp0(storage_name,tp->storage) == 0) { + nb_tapes++; + } + } diff --git a/amanda.spec b/amanda.spec index 9d5182c..0e57297 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -31,6 +31,8 @@ Patch4: amanda-3.3.9-hash-permission.patch # Fails to build on non-x86 due to sse-related things. This patch comes from # upstream. Patch5: amanda-3.4.2-fix-sse.patch +# Patch from upstream to fix segfault in planner. +Patch6: amanda-3.4.2-planner-segfault.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -440,6 +442,10 @@ make check %changelog +* Mon Feb 20 2017 Jason L Tibbitts III - 3.4.2-2 +- Add patch from upstream to fix a segfault in planner. Hopefully fixes + https://bugzilla.redhat.com/show_bug.cgi?id=1423471 + * Tue Jan 31 2017 Jason L Tibbitts III - 3.4.2-1 - Update to 3.4.2. - Remove upstreamed patches. From d514bd6fef131ef1fb474122019a8354c67856fc Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 1 Mar 2017 10:42:21 +0100 Subject: [PATCH 098/182] Resolves: #1427775 - fix problem with local authentication --- amanda-3.4.2-local-security-gid.patch | 12 ++++++++++++ amanda.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 amanda-3.4.2-local-security-gid.patch diff --git a/amanda-3.4.2-local-security-gid.patch b/amanda-3.4.2-local-security-gid.patch new file mode 100644 index 0000000..87ff91c --- /dev/null +++ b/amanda-3.4.2-local-security-gid.patch @@ -0,0 +1,12 @@ +diff -urNp old/common-src/local-security.c new/common-src/local-security.c +--- old/common-src/local-security.c 2017-01-31 16:05:21.000000000 +0100 ++++ new/common-src/local-security.c 2017-02-17 13:22:59.318412325 +0100 +@@ -277,7 +277,7 @@ runlocal( + initgroups(CLIENT_LOGIN, gid); + } + if (gid != 0) +- setregid(uid, gid); ++ setregid(gid, gid); + if (uid != 0) + setreuid(uid, uid); + #endif diff --git a/amanda.spec b/amanda.spec index 6ae2c13..54fc2e0 100644 --- a/amanda.spec +++ b/amanda.spec @@ -26,13 +26,15 @@ 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 -#Bugfix - solved problem with permission error message (#1257686) +# Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch # Fails to build on non-x86 due to sse-related things. This patch comes from # upstream. Patch5: amanda-3.4.2-fix-sse.patch # Patch from upstream to fix segfault in planner. Patch6: amanda-3.4.2-planner-segfault.patch +# Fix problem with local authentication +Patch7: amanda-3.4.2-local-security-gid.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -442,6 +444,9 @@ make check %changelog +* 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 From 20a8503b9d4523546bf84ed1a5596b050096394c Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 1 Mar 2017 11:41:44 +0100 Subject: [PATCH 099/182] Bump spec --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 54fc2e0..8dfa317 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist From 06a2ee1d8ac5e31b86b75bb9c38c2d438f7ddb23 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 2 Mar 2017 09:50:42 +0100 Subject: [PATCH 100/182] Resolves: #1428185 - new upstream release 3.4.3 --- .gitignore | 1 + amanda-3.4.2-fix-sse.patch | 16 ---------------- amanda-3.4.2-local-security-gid.patch | 12 ------------ amanda-3.4.2-planner-segfault.patch | 12 ------------ amanda.spec | 14 +++++--------- sources | 2 +- 6 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 amanda-3.4.2-fix-sse.patch delete mode 100644 amanda-3.4.2-local-security-gid.patch delete mode 100644 amanda-3.4.2-planner-segfault.patch diff --git a/.gitignore b/.gitignore index 2d11c9c..328b7d4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ amanda-*.*.*/ /amanda-3.4.tar.gz /amanda-3.4.1.tar.gz /amanda-3.4.2.tar.gz +/amanda-3.4.3.tar.gz diff --git a/amanda-3.4.2-fix-sse.patch b/amanda-3.4.2-fix-sse.patch deleted file mode 100644 index 6b58323..0000000 --- a/amanda-3.4.2-fix-sse.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/common-src/amutil.c b/common-src/amutil.c -index 864d78f..25d9fca 100644 ---- a/common-src/amutil.c -+++ b/common-src/amutil.c -@@ -2096,6 +2096,11 @@ static int get_sse42(void) - #endif - return (ecx >> 20) & 1; - } -+#else -+static int get_sse42(void) -+{ -+ return 0; -+} - #endif - - static uint32_t crc_table[16][256]; diff --git a/amanda-3.4.2-local-security-gid.patch b/amanda-3.4.2-local-security-gid.patch deleted file mode 100644 index 87ff91c..0000000 --- a/amanda-3.4.2-local-security-gid.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp old/common-src/local-security.c new/common-src/local-security.c ---- old/common-src/local-security.c 2017-01-31 16:05:21.000000000 +0100 -+++ new/common-src/local-security.c 2017-02-17 13:22:59.318412325 +0100 -@@ -277,7 +277,7 @@ runlocal( - initgroups(CLIENT_LOGIN, gid); - } - if (gid != 0) -- setregid(uid, gid); -+ setregid(gid, gid); - if (uid != 0) - setreuid(uid, uid); - #endif diff --git a/amanda-3.4.2-planner-segfault.patch b/amanda-3.4.2-planner-segfault.patch deleted file mode 100644 index a2743ef..0000000 --- a/amanda-3.4.2-planner-segfault.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/server-src/tapefile.c -+++ a/server-src/tapefile.c -@@ -1199,8 +1199,7 @@ nb_tape_in_storage( - int nb_tapes = 0; - - for (tp = tape_list; tp != NULL; tp = tp->next) { -- if (tp->storage && -- g_str_equal(storage_name, tp->storage)) { -+ if (g_strcmp0(storage_name,tp->storage) == 0) { - nb_tapes++; - } - } diff --git a/amanda.spec b/amanda.spec index 8dfa317..1d91ab2 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.4.2 -Release: 4%{?dist} +Version: 3.4.3 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,13 +28,6 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch # Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch -# Fails to build on non-x86 due to sse-related things. This patch comes from -# upstream. -Patch5: amanda-3.4.2-fix-sse.patch -# Patch from upstream to fix segfault in planner. -Patch6: amanda-3.4.2-planner-segfault.patch -# Fix problem with local authentication -Patch7: amanda-3.4.2-local-security-gid.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -444,6 +437,9 @@ make check %changelog +* 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) diff --git a/sources b/sources index 285bc00..0433e39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.4.2.tar.gz) = dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd +SHA512 (amanda-3.4.3.tar.gz) = 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a From 80b011b0e0acc161d0054ea70bfa35c49dee0eb5 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 3 May 2017 13:10:06 -0500 Subject: [PATCH 101/182] Update to 3.4.4. --- .gitignore | 1 + amanda.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 328b7d4..76c28d6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ amanda-*.*.*/ /amanda-3.4.1.tar.gz /amanda-3.4.2.tar.gz /amanda-3.4.3.tar.gz +/amanda-3.4.4.tar.gz diff --git a/amanda.spec b/amanda.spec index 1d91ab2..49c7767 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,7 +9,7 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.4.3 +Version: 3.4.4 Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab @@ -437,6 +437,9 @@ make check %changelog +* 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) diff --git a/sources b/sources index 0433e39..f0f8cef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.4.3.tar.gz) = 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a +SHA512 (amanda-3.4.4.tar.gz) = e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 From 4dbd656ec3dac07abf1dd6a4257bbdbf431a0f3e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sun, 4 Jun 2017 09:36:58 +0200 Subject: [PATCH 102/182] Perl 5.26 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 49c7767..69e29c2 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -437,6 +437,9 @@ make check %changelog +* 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. From 677213f9c2312bffba800837aacbf6a4eff13ffc Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 8 Jun 2017 13:09:34 -0500 Subject: [PATCH 103/182] Update to 3.4.5. --- .gitignore | 1 + amanda.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 76c28d6..bdc7700 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ amanda-*.*.*/ /amanda-3.4.2.tar.gz /amanda-3.4.3.tar.gz /amanda-3.4.4.tar.gz +/amanda-3.4.5.tar.gz diff --git a/amanda.spec b/amanda.spec index 49c7767..7bd3b41 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,7 +9,7 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.4.4 +Version: 3.4.5 Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab @@ -437,6 +437,9 @@ make check %changelog +* Thu Jun 08 2017 Jason L Tibbitts III - 3.4.5-1 +- New upstream release 3.4.5. + * Wed May 03 2017 Jason L Tibbitts III - 3.4.4-1 - New upstream relase 3.4.4. diff --git a/sources b/sources index f0f8cef..29d899f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.4.4.tar.gz) = e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 +SHA512 (amanda-3.4.5.tar.gz) = 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c From e66aa731111efc7472506723d9e232faf7144eb1 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 9 Jun 2017 14:26:08 +0200 Subject: [PATCH 104/182] Perl 5.26 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 1f3d1fd..e487aa6 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -437,6 +437,9 @@ make check %changelog +* 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. From 6eb352977b7cfeaf210e085a41c6e732f81cd9b7 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 13 Jun 2017 12:52:16 -0500 Subject: [PATCH 105/182] Modify amserverconfig to not mention xinetd. In https://bugzilla.redhat.com/show_bug.cgi?id=1460763 a user is running amserverconfig and is confused because it tells them to mess with xinetd files. Obviously xinetd manipulation is unnecessary on Fedora, but the script may otherwise be useful and it doesn't actually do anything with xinetd besides printing the message. So let's patch out the call to the function which outputs the xinetd-related message. --- amanda-3.4.5-no-xinetd.patch | 12 ++++++++++++ amanda.spec | 23 ++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 amanda-3.4.5-no-xinetd.patch 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.spec b/amanda.spec index 1f3d1fd..52282b1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,6 +28,8 @@ Patch2: amanda-3.1.1-tcpport.patch Patch3: amanda-3.2.0-config-dir.patch # Bugfix - solved problem with permission error message (#1257686) Patch4: amanda-3.3.9-hash-permission.patch +# Don't mention xinetd files in amserverconfig (#1460763) +Patch5: amanda-3.4.5-no-xinetd.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -437,6 +439,9 @@ make check %changelog +* Tue Jun 13 2017 Jason L Tibbitts III - 3.4.5-2 +- Modify amserverconfig to not mention xinetd (#1460763) + * Thu Jun 08 2017 Jason L Tibbitts III - 3.4.5-1 - New upstream release 3.4.5. @@ -605,7 +610,7 @@ make check * 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. +- Fix autogen for parallel tests. * Thu Dec 06 2012 Lukáš Nykrýn - 3.3.2-3 - Fix group ownership @@ -714,7 +719,7 @@ make check - 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 +- 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 @@ -732,7 +737,7 @@ make check - rebuilt with new openssl * Tue Aug 04 2009 Daniel Novotny 2.6.0p2-12 --fix #512534 - amstatus outputs "Insecure dependency in printf ..." +-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 @@ -745,7 +750,7 @@ make check 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") +- 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 @@ -939,7 +944,7 @@ make check 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 @@ -1017,7 +1022,7 @@ make check * Fri Jul 13 2001 Trond Eivind Glomsrød - Build and install the "tapetype" utility program, for - tape size identification (#48745) + tape size identification (#48745) * Tue Jun 19 2001 Trond Eivind Glomsrød - don't use %%configure, to make it build @@ -1036,7 +1041,7 @@ make check avoid samba being built without such support * Thu Feb 22 2001 Trond Eivind Glomsrød -- Use %%{version} in source URL, and thus actually use +- 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) @@ -1154,7 +1159,7 @@ make check * 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 From 7ffa1520ab7d5c9f385842df155d89d6d6ec060b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:48:17 +0000 Subject: [PATCH 106/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 2c45ffb..1e83c67 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.5 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -439,6 +439,9 @@ make check %changelog +* 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) From 2b37e15a4e6f72713e5f9e9bb06493b913420c56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:32:34 +0000 Subject: [PATCH 107/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 1e83c67..9dddd9b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.4.5 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -439,6 +439,9 @@ make check %changelog +* 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 From bf23cfe508c8b6c7cff9c7a60468ecc99fa3fb55 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 28 Sep 2017 19:55:10 -0500 Subject: [PATCH 108/182] Initial attempt to update to 3.5. --- .gitignore | 1 + amanda.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bdc7700..77ea358 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ amanda-*.*.*/ /amanda-3.4.3.tar.gz /amanda-3.4.4.tar.gz /amanda-3.4.5.tar.gz +/amanda-3.5.tar.gz diff --git a/amanda.spec b/amanda.spec index 9dddd9b..5768e7c 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.4.5 -Release: 5%{?dist} +Version: 3.5 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -26,10 +26,8 @@ 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 -# Bugfix - solved problem with permission error message (#1257686) -Patch4: amanda-3.3.9-hash-permission.patch # Don't mention xinetd files in amserverconfig (#1460763) -Patch5: amanda-3.4.5-no-xinetd.patch +Patch4: amanda-3.4.5-no-xinetd.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -290,6 +288,7 @@ make check %{_libdir}/libndmlib*.so %files server +%{_libexecdir}/amanda/ambind %{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amcheck-device %{_libexecdir}/amanda/amidxtaped @@ -439,6 +438,9 @@ make check %changelog +* 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 diff --git a/sources b/sources index 29d899f..7c7837b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.4.5.tar.gz) = 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c +SHA512 (amanda-3.5.tar.gz) = 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c From 4c6d80fdefbb59febae070763b0945ef710a2ee3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Nov 2017 16:24:35 +0100 Subject: [PATCH 109/182] Remove old crufty coreutils requires Signed-off-by: Igor Gnatenko --- amanda.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/amanda.spec b/amanda.spec index 5768e7c..80812d7 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -35,7 +35,7 @@ URL: http://www.amanda.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool BuildRequires: dump xfsdump -BuildRequires: gnuplot cups samba-client tar grep fileutils +BuildRequires: gnuplot cups samba-client tar grep BuildRequires: gcc-c++ readline-devel BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simple) @@ -44,7 +44,7 @@ BuildRequires: libcurl-devel procps-ng Requires(post): grep sed systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires: fileutils grep tar /bin/mail +Requires: grep tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} Obsoletes: amanda-devel < 2.6.1p2-5 @@ -71,7 +71,7 @@ well. %package libs Summary: Amanda libraries Group: Applications/System -Requires: fileutils grep +Requires: grep %description libs This package contains basic Amanda libraries, which are used by all @@ -80,7 +80,7 @@ Amanda programs. %package client Summary: The client component of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep +Requires: grep Requires(pre): amanda = %{version}-%{release} Requires: amanda-libs%{?_isa} = %{version}-%{release} @@ -93,7 +93,7 @@ AMANDA client machine. %package server Summary: The server side of the AMANDA tape backup system Group: Applications/System -Requires: fileutils grep +Requires: grep Requires: perl(Amanda::DB) perl(Amanda::Recovery) perl(Amanda::Service) Requires(pre): amanda = %{version}-%{release} Requires: amanda-libs%{?_isa} = %{version}-%{release} @@ -438,6 +438,9 @@ make check %changelog +* 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. From 1b732b87ab538bc396fc6b3ef7f4d1dca7b320f3 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 8 Jan 2018 13:58:03 -0600 Subject: [PATCH 110/182] Initial update to 3.5.1. This doesn't yet build due the RPC removal. I wanted to get 3.5.1 in as a base for fixing that. --- .gitignore | 1 + amanda.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 77ea358..1dc449d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ amanda-*.*.*/ /amanda-3.4.4.tar.gz /amanda-3.4.5.tar.gz /amanda-3.5.tar.gz +/amanda-3.5.1.tar.gz diff --git a/amanda.spec b/amanda.spec index 80812d7..218b35f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -9,8 +9,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.5 -Release: 2%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist diff --git a/sources b/sources index 7c7837b..2af25ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.5.tar.gz) = 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c +SHA512 (amanda-3.5.1.tar.gz) = 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f From 19cd9ad06bf1b58bd1ff966e191ddc6873d89302 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 8 Jan 2018 14:59:36 -0600 Subject: [PATCH 111/182] Build without ndmp for now. --- amanda.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/amanda.spec b/amanda.spec index 218b35f..63a7752 100644 --- a/amanda.spec +++ b/amanda.spec @@ -135,7 +135,8 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie --with-rsh-security \ --with-bsdtcp-security \ --with-bsdudp-security \ - --with-krb5-security + --with-krb5-security \ + --without-ndmp pushd perl make maintainer-clean-am @@ -225,11 +226,11 @@ make check %{_libexecdir}/amanda/amandad %{_libexecdir}/amanda/amanda-sh-lib.sh %{_libexecdir}/amanda/amcat.awk -%{_libexecdir}/amanda/amndmjob +#{_libexecdir}/amanda/amndmjob %{_libexecdir}/amanda/amplot.awk %{_libexecdir}/amanda/amplot.g %{_libexecdir}/amanda/amplot.gp -%{_libexecdir}/amanda/ndmjob +#{_libexecdir}/amanda/ndmjob %{_sbindir}/amandad %{_sbindir}/amaespipe @@ -284,8 +285,8 @@ make check %{_libdir}/libamar*.so %{_libdir}/libamglue*.so %{_libdir}/libamxfer*.so -%{_libdir}/libndmjob*.so -%{_libdir}/libndmlib*.so +#{_libdir}/libndmjob*.so +#{_libdir}/libndmlib*.so %files server %{_libexecdir}/amanda/ambind @@ -438,6 +439,11 @@ make check %changelog +* 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 From f2a6c7190f1a4e0ad281ab4ed396aba574ca2ce5 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 25 Jan 2018 12:35:08 -0600 Subject: [PATCH 112/182] Dependency cleanup. Use proper systemd dependencies and clean up a few other dependencies. --- amanda.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/amanda.spec b/amanda.spec index 63a7752..6392aed 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -40,14 +40,11 @@ BuildRequires: gcc-c++ readline-devel BuildRequires: krb5-devel rsh openssh-clients ncompress 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 procps-ng -Requires(post): grep sed systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +BuildRequires: libcurl-devel procps-ng systemd Requires: grep tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} -Obsoletes: amanda-devel < 2.6.1p2-5 +%{?systemd_requires} %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\) @@ -439,6 +436,11 @@ make check %changelog +* 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 From ad22c3ad9465d41d94905dde8bfa80f084921d64 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Fri, 26 Jan 2018 14:39:24 -0600 Subject: [PATCH 113/182] Add patch to use libtirpc. Upstream provided a patch which lets us use libtirpc. This lets us re-enable ndmp support. --- amanda.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/amanda.spec b/amanda.spec index 6392aed..02798d1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -28,6 +28,8 @@ 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 License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System @@ -36,7 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool BuildRequires: dump xfsdump BuildRequires: gnuplot cups samba-client tar grep -BuildRequires: gcc-c++ readline-devel +BuildRequires: gcc-c++ readline-devel libtirpc-devel BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simple) BuildRequires: glib2-devel openssl-devel swig bison flex @@ -132,8 +134,7 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie --with-rsh-security \ --with-bsdtcp-security \ --with-bsdudp-security \ - --with-krb5-security \ - --without-ndmp + --with-krb5-security pushd perl make maintainer-clean-am @@ -223,11 +224,11 @@ make check %{_libexecdir}/amanda/amandad %{_libexecdir}/amanda/amanda-sh-lib.sh %{_libexecdir}/amanda/amcat.awk -#{_libexecdir}/amanda/amndmjob +%{_libexecdir}/amanda/amndmjob %{_libexecdir}/amanda/amplot.awk %{_libexecdir}/amanda/amplot.g %{_libexecdir}/amanda/amplot.gp -#{_libexecdir}/amanda/ndmjob +%{_libexecdir}/amanda/ndmjob %{_sbindir}/amandad %{_sbindir}/amaespipe @@ -282,8 +283,8 @@ make check %{_libdir}/libamar*.so %{_libdir}/libamglue*.so %{_libdir}/libamxfer*.so -#{_libdir}/libndmjob*.so -#{_libdir}/libndmlib*.so +%{_libdir}/libndmjob*.so +%{_libdir}/libndmlib*.so %files server %{_libexecdir}/amanda/ambind @@ -436,6 +437,9 @@ make check %changelog +* 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. From 5d9c0472c3f4387ae68f023b986b14a9df29642d Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Fri, 26 Jan 2018 14:49:30 -0600 Subject: [PATCH 114/182] Actually commit the patch.... --- patch-tirpc | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 patch-tirpc 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]) From 59c9f15b81bf60597910b4e86eef61f5fef3afce Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Mon, 29 Jan 2018 17:46:07 -0600 Subject: [PATCH 115/182] Assign setuid permissions properly. --- amanda.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/amanda.spec b/amanda.spec index 02798d1..458f244 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -287,7 +287,7 @@ make check %{_libdir}/libndmlib*.so %files server -%{_libexecdir}/amanda/ambind +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/ambind %{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amcheck-device %{_libexecdir}/amanda/amidxtaped @@ -299,9 +299,9 @@ make check %{_libexecdir}/amanda/amadmin_perl %{_libexecdir}/amanda/ambackupd %{_libexecdir}/amanda/rest-server/ -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper +%{_libexecdir}/amanda/dumper %{_libexecdir}/amanda/chunker -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner +%{_libexecdir}/amanda/planner %{_libexecdir}/amanda/taper %{_sbindir}/activate-devpay @@ -313,7 +313,7 @@ make check %{_sbindir}/amdump %{_sbindir}/amfetchdump %{_sbindir}/amflush -%attr(4750,root,%amanda_group) %{_sbindir}/amcheck +%{_sbindir}/amcheck %{_sbindir}/amcheckdb %{_sbindir}/amcheckdump %{_sbindir}/amlabel @@ -322,7 +322,7 @@ make check %{_sbindir}/amrestore %{_sbindir}/amrmtape %{_sbindir}/amserverconfig -%attr(4750,root,%amanda_group) %{_sbindir}/amservice +%{_sbindir}/amservice %{_sbindir}/amstatus %{_sbindir}/amtape %{_sbindir}/amtapetype @@ -437,6 +437,9 @@ make check %changelog +* 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. From b9327bc306401a0b3d5614ce56cd7b6225c25c34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:10:38 +0000 Subject: [PATCH 116/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 458f244..e5a1976 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -437,6 +437,9 @@ make check %changelog +* 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. From 92a6c2eb52bb5109ebc40f2b733e89039bd2d634 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:01:32 +0100 Subject: [PATCH 117/182] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- amanda.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index e5a1976..7bcd6d2 100644 --- a/amanda.spec +++ b/amanda.spec @@ -34,7 +34,6 @@ Patch5: patch-tirpc License: BSD and GPLv3+ and GPLv2+ and GPLv2 Group: Applications/System URL: http://www.amanda.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool BuildRequires: dump xfsdump BuildRequires: gnuplot cups samba-client tar grep From baef040d8a62b1bd8a0a107209a1a7cb15d81243 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 14 Feb 2018 14:00:25 +0100 Subject: [PATCH 118/182] Remove Group tag --- amanda.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/amanda.spec b/amanda.spec index 7bcd6d2..00a7a7c 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -32,7 +32,6 @@ Patch4: amanda-3.4.5-no-xinetd.patch Patch5: patch-tirpc License: BSD and GPLv3+ and GPLv2+ and GPLv2 -Group: Applications/System URL: http://www.amanda.org BuildRequires: automake autoconf libtool BuildRequires: dump xfsdump @@ -68,7 +67,6 @@ well. %package libs Summary: Amanda libraries -Group: Applications/System Requires: grep %description libs @@ -77,7 +75,6 @@ Amanda programs. %package client Summary: The client component of the AMANDA tape backup system -Group: Applications/System Requires: grep Requires(pre): amanda = %{version}-%{release} Requires: amanda-libs%{?_isa} = %{version}-%{release} @@ -90,7 +87,6 @@ AMANDA client machine. %package server Summary: The server side of the AMANDA tape backup system -Group: Applications/System Requires: grep Requires: perl(Amanda::DB) perl(Amanda::Recovery) perl(Amanda::Service) Requires(pre): amanda = %{version}-%{release} @@ -436,6 +432,9 @@ make check %changelog +* 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 From ebbd6288d33d2c00d434bf95c4e0b15fde68440b Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 14 Feb 2018 17:35:06 -0600 Subject: [PATCH 119/182] Remove ldconfig macros. Technically since 3.5 is probably going to be rawhide-only, we could just remove ldconfig from the scriptlets entirely. But just in case, I converted to the new macros. --- amanda.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/amanda.spec b/amanda.spec index 00a7a7c..94681de 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 6%{?dist} +Release: 7%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -44,6 +44,8 @@ BuildRequires: libcurl-devel procps-ng systemd Requires: grep tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconifg %{?systemd_requires} %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\) @@ -181,7 +183,7 @@ make check /usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || : %post -/sbin/ldconfig +%{?ldconfig} %systemd_post amanda.socket %systemd_post amanda-udp.socket %systemd_post kamanda.socket @@ -192,18 +194,13 @@ make check %systemd_preun kamanda.socket %postun -/sbin/ldconfig +%{?ldconfig} %systemd_postun_with_restart amanda.socket %systemd_postun_with_restart amanda-udp.socket %systemd_postun_with_restart kamanda.socket -%post client -p /sbin/ldconfig - -%post server -p /sbin/ldconfig - -%postun client -p /sbin/ldconfig - -%postun server -p /sbin/ldconfig +%ldconfig_scriptlets client +%ldconfig_scriptlets server %files %license COPYRIGHT @@ -432,6 +429,9 @@ make check %changelog +* 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 From a3ab4c733ea6170899684b99f9ea2fa946ffb961 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 15 Feb 2018 19:12:55 -0600 Subject: [PATCH 120/182] Fix embarrassing typo. --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 94681de..4a317a1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 7%{?dist} +Release: 8%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -45,7 +45,7 @@ Requires: grep tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconifg +Requires(postun): /sbin/ldconfig %{?systemd_requires} %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\) @@ -429,6 +429,9 @@ make check %changelog +* 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. From d810e3b971e82fa8a195b8ac65d0469c483aa529 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 21 Feb 2018 14:18:43 +0100 Subject: [PATCH 121/182] Resolves: #1547499 - add RPM_LD_FLAGS to build section --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 4a317a1..9d6a423 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 8%{?dist} +Release: 9%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -107,7 +107,7 @@ server also needs to have the amanda-client package installed. %build ./autogen -export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS=-pie +export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pie" %configure --enable-shared \ --disable-rpath \ --disable-static \ @@ -429,6 +429,9 @@ make check %changelog +* 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. From d81d0c97cd3c219d6ddeb594c251595920abc4a3 Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Thu, 12 Apr 2018 09:12:41 +0200 Subject: [PATCH 122/182] Remove perl(Dancer2) requirements --- amanda.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 9d6a423..4c7fa2e 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 9%{?dist} +Release: 10%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -54,6 +54,9 @@ Requires(postun): /sbin/ldconfig # 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 @@ -429,6 +432,9 @@ make check %changelog +* 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) From 3ffd85638005b7370f239675d044765a347b416f Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Mon, 30 Apr 2018 15:00:08 +0200 Subject: [PATCH 123/182] Modify /var/log/amanda directory permission --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 4c7fa2e..a6b72aa 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 10%{?dist} +Release: 11%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -266,7 +266,7 @@ make check %attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/ %attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts -%attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda +%attr(02760,%amanda_user,%amanda_group) %dir /var/log/amanda %files libs %{_libdir}/libamdevice*.so @@ -432,6 +432,9 @@ make check %changelog +* 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 From 2792baf8518822934123490f4f8675c8f950285b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 27 Jun 2018 21:26:30 +0200 Subject: [PATCH 124/182] Perl 5.28 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index a6b72aa..5a1cffd 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 11%{?dist} +Release: 12%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -432,6 +432,9 @@ make check %changelog +* 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 From 35096dcc1208895ba0fd9a2d0980fda52e8f4227 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:10:28 +0000 Subject: [PATCH 125/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 5a1cffd..1daa248 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 12%{?dist} +Release: 13%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -432,6 +432,9 @@ make check %changelog +* 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 From 994c3d9d055795c098c8de663301a5639fcaebb0 Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Mon, 30 Jul 2018 15:13:06 +0200 Subject: [PATCH 126/182] Modify permisions of /var/log/amanda/amandad directory --- amanda.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/amanda.spec b/amanda.spec index 1daa248..265fecb 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 13%{?dist} +Release: 14%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -147,7 +147,7 @@ make %{?_smp_mflags} make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/amanda -mkdir -p $RPM_BUILD_ROOT/var/log/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 install -p -m 644 -D %{SOURCE9} %{buildroot}%{_unitdir}/amanda.socket @@ -266,7 +266,8 @@ make check %attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/ %attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts -%attr(02760,%amanda_user,%amanda_group) %dir /var/log/amanda +%attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda +%attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda/amandad %files libs %{_libdir}/libamdevice*.so @@ -432,6 +433,9 @@ make check %changelog +* 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 From 41dbe71d8491f47ab2f94b1cc9adb0163ce1fec6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:14:23 +0000 Subject: [PATCH 127/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 265fecb..9028b23 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 14%{?dist} +Release: 15%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -433,6 +433,9 @@ make check %changelog +* 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 From ed4498495ec38ec1c63542f54cfe5333bde4e382 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 6 Feb 2019 17:25:04 -0600 Subject: [PATCH 128/182] Fix index generation with xfsrestore Recent changes to the permissions of /var/log/amanda caused issues with index generation, because xfsrestore would put temporaries there. So instead force xfsrestore to (during index generation) store its temporaries in /var/lib/amanda instead. --- amanda.spec | 10 +++++++++- patch-xfsrestore-housekeeping | 13 +++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 patch-xfsrestore-housekeeping diff --git a/amanda.spec b/amanda.spec index 9028b23..3875623 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 15%{?dist} +Release: 16%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -31,6 +31,10 @@ 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 + License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org BuildRequires: automake autoconf libtool @@ -433,6 +437,10 @@ make check %changelog +* 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 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); From 589812faeeb9b6a2090eb4c4b82c4e808d7bbe46 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:49 +0100 Subject: [PATCH 129/182] Rebuild for readline 8.0 --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 3875623..0df74d2 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 16%{?dist} +Release: 17%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -437,6 +437,9 @@ make check %changelog +* 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) From 95d6d50211067b42bdebf1b3db6594295f83741b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 13:57:30 +0200 Subject: [PATCH 130/182] Perl 5.30 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 0df74d2..0c6ef53 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 17%{?dist} +Release: 18%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -437,6 +437,9 @@ make check %changelog +* 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 From 139d7d48d277209227e88c9985e8daed14be4c0b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 13 Jun 2019 16:54:46 -0600 Subject: [PATCH 131/182] Move ambind to amanda package (bug #1710147) --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 0c6ef53..b998087 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 18%{?dist} +Release: 19%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -222,6 +222,7 @@ make check %dir %{_libexecdir}/amanda %{_libexecdir}/amanda/amandad %{_libexecdir}/amanda/amanda-sh-lib.sh +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/ambind %{_libexecdir}/amanda/amcat.awk %{_libexecdir}/amanda/amndmjob %{_libexecdir}/amanda/amplot.awk @@ -287,7 +288,6 @@ make check %{_libdir}/libndmlib*.so %files server -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/ambind %{_libexecdir}/amanda/amdumpd %{_libexecdir}/amanda/amcheck-device %{_libexecdir}/amanda/amidxtaped @@ -437,6 +437,9 @@ make check %changelog +* 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 From 6763ff5341c9292c75043626f48b0295d6298baa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:49:14 +0000 Subject: [PATCH 132/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index b998087..8480c50 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 19%{?dist} +Release: 20%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -437,6 +437,9 @@ make check %changelog +* 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) From 8fc6a19e10c26baa8c2335cc55eb2896ac699618 Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Tue, 21 Jan 2020 19:01:31 +0100 Subject: [PATCH 133/182] Fix FTBFS caused by missing 'extern' on global var Resolves: #1793391 --- amanda-missing-extern.patch | 13 +++++++++++++ amanda.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 amanda-missing-extern.patch diff --git a/amanda-missing-extern.patch b/amanda-missing-extern.patch new file mode 100644 index 0000000..a036343 --- /dev/null +++ b/amanda-missing-extern.patch @@ -0,0 +1,13 @@ +diff --git a/common-src/testutils.h b/common-src/testutils.h +index 31f89737..2e9bb0b3 100644 +--- a/common-src/testutils.h ++++ b/common-src/testutils.h +@@ -75,7 +75,7 @@ typedef struct TestUtilsTest { + #define tu_dbg(...) if (tu_debugging_enabled) { g_fprintf(stderr, __VA_ARGS__); } + + /* Is debugging enabled for this test run? (set internally) */ +-int tu_debugging_enabled; ++extern gboolean tu_debugging_enabled; + + /* + * Main loop diff --git a/amanda.spec b/amanda.spec index 8480c50..4e66ac6 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 20%{?dist} +Release: 21%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -35,6 +35,9 @@ Patch5: patch-tirpc # https://bugzilla.redhat.com/show_bug.cgi?id=1671117 Patch6: patch-xfsrestore-housekeeping +# Add missing extern keyword to global vars in header files +Patch7: amanda-missing-extern.patch + License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org BuildRequires: automake autoconf libtool @@ -437,6 +440,9 @@ make check %changelog +* 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 From 372ed351627c95942900fc77c909f5bbe8a95d88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:29:20 +0000 Subject: [PATCH 134/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 4e66ac6..9bab3a4 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 21%{?dist} +Release: 22%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -440,6 +440,9 @@ make check %changelog +* 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) From fe3215bc6cdd24e698431530850b13f6d5107d0e Mon Sep 17 00:00:00 2001 From: Vaclav Dolezal Date: Wed, 5 Feb 2020 16:38:41 +0100 Subject: [PATCH 135/182] Drop support for 'dump' backend. --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 9bab3a4..21338d1 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 22%{?dist} +Release: 23%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -41,7 +41,7 @@ Patch7: amanda-missing-extern.patch License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org BuildRequires: automake autoconf libtool -BuildRequires: dump xfsdump +BuildRequires: xfsdump BuildRequires: gnuplot cups samba-client tar grep BuildRequires: gcc-c++ readline-devel libtirpc-devel BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st @@ -440,6 +440,9 @@ make check %changelog +* 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 From b3b18d71d34606638eb8574348c7150e0a25033f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 19:17:08 +0200 Subject: [PATCH 136/182] Perl 5.32 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 21338d1..22d8ae5 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 23%{?dist} +Release: 24%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -440,6 +440,9 @@ make check %changelog +* 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. From 1719d15d01633b0416d61472ad70b9f2a941d4e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:58:52 +0000 Subject: [PATCH 137/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 22d8ae5..2db3378 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 24%{?dist} +Release: 25%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -440,6 +440,9 @@ make check %changelog +* 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 From 10289d7db32e16b62259537a3af7ba8348583718 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:56:37 +0000 Subject: [PATCH 138/182] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 2db3378..054fbf0 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 25%{?dist} +Release: 26%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -440,6 +440,10 @@ make check %changelog +* 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 From e9524b2adb9eeb214bb0c7df99cbe12209e4b786 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:25:29 +0000 Subject: [PATCH 139/182] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- amanda.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/amanda.spec b/amanda.spec index 054fbf0..233b25a 100644 --- a/amanda.spec +++ b/amanda.spec @@ -48,6 +48,7 @@ BuildRequires: krb5-devel rsh openssh-clients ncompress 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 procps-ng systemd +BuildRequires: make Requires: grep tar /bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} From b8f920f825c234c1096e78f74d2ac5661bb9dce5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:01:59 +0000 Subject: [PATCH 140/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 233b25a..114b3c5 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 26%{?dist} +Release: 27%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -441,6 +441,9 @@ make check %changelog +* 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 From 565b588f818d3cac43bae25e126bd2efb6474a62 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Tue, 9 Feb 2021 11:09:47 +0100 Subject: [PATCH 141/182] Make gnuplot dependency and amplot optional Allows to reduce dependencies, esp. on RHEL. Without gnuplot, amplot will not be built and included in the package. --- amanda.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index 114b3c5..26778e5 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,3 +1,9 @@ +%if 0%{?rhel} >= 9 +%bcond_with gnuplot +%else +%bcond_without gnuplot +%endif + %define _libexecdir %{_libdir} %define defconfig DailySet1 %define indexserver amandahost @@ -42,7 +48,10 @@ License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org BuildRequires: automake autoconf libtool BuildRequires: xfsdump -BuildRequires: gnuplot cups samba-client tar grep +%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 ncompress mtx mt-st BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simple) @@ -138,6 +147,9 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pi --with-group=%amanda_group \ --with-tmpdir=/var/log/amanda \ --with-gnutar=/bin/tar \ +%if %{without gnuplot} + --without-gnuplot \ +%endif --with-ssh-security \ --with-rsh-security \ --with-bsdtcp-security \ @@ -227,11 +239,13 @@ make check %{_libexecdir}/amanda/amandad %{_libexecdir}/amanda/amanda-sh-lib.sh %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/ambind -%{_libexecdir}/amanda/amcat.awk %{_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 @@ -243,7 +257,9 @@ make check %{_sbindir}/amcryptsimple %{_sbindir}/amgetconf %{_sbindir}/amgpgcrypt +%if %{with gnuplot} %{_sbindir}/amplot +%endif %{_sbindir}/amssl %{perl_vendorarch}/Amanda/ @@ -257,7 +273,9 @@ make check %{_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* From 2acaf235d9a398e2145f56f48d508f00109b3a91 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Tue, 9 Feb 2021 11:16:07 +0100 Subject: [PATCH 142/182] Bump Release and update changelog --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 26778e5..7b51476 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 27%{?dist} +Release: 28%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -459,6 +459,9 @@ make check %changelog +* 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 From 9365686a26fd02841c748fe843aacd337d7e1320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:01:29 +0100 Subject: [PATCH 143/182] Coalesce systemd scriptlets It is more efficient to do callout just once. --- amanda.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/amanda.spec b/amanda.spec index 7b51476..eceac44 100644 --- a/amanda.spec +++ b/amanda.spec @@ -207,20 +207,14 @@ make check %post %{?ldconfig} -%systemd_post amanda.socket -%systemd_post amanda-udp.socket -%systemd_post kamanda.socket +%systemd_post amanda.socket amanda-udp.socket kamanda.socket %preun -%systemd_preun amanda.socket -%systemd_preun amanda-udp.socket -%systemd_preun kamanda.socket +%systemd_preun amanda.socket amanda-udp.socket kamanda.socket %postun %{?ldconfig} -%systemd_postun_with_restart amanda.socket -%systemd_postun_with_restart amanda-udp.socket -%systemd_postun_with_restart kamanda.socket +%systemd_postun_with_restart amanda.socket amanda-udp.socket kamanda.socket %ldconfig_scriptlets client %ldconfig_scriptlets server From f90645a59bdf326076bd811e0e1c237ab77d2772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:13 +0100 Subject: [PATCH 144/182] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- amanda.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index eceac44..ff5a1cd 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 28%{?dist} +Release: 29%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -453,6 +453,10 @@ make check %changelog +* 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. From 95e51235e9d32a9a3781e7c7bb8a46ea97c953dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Wed, 3 Mar 2021 15:38:11 +0100 Subject: [PATCH 145/182] Use /usr/bin/mail as mailer --- amanda.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/amanda.spec b/amanda.spec index ff5a1cd..622b423 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 29%{?dist} +Release: 30%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -58,7 +58,7 @@ BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simpl BuildRequires: glib2-devel openssl-devel swig bison flex BuildRequires: libcurl-devel procps-ng systemd BuildRequires: make -Requires: grep tar /bin/mail +Requires: grep tar /usr/bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} Requires(post): /sbin/ldconfig @@ -127,7 +127,7 @@ server also needs to have the amanda-client package installed. %build ./autogen -export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pie" +export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pie" %configure --enable-shared \ --disable-rpath \ --disable-static \ @@ -453,6 +453,9 @@ make check %changelog +* 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. From d631a05c13835a1dbc0797dadad1a5c30c3c8d47 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:28:06 +0200 Subject: [PATCH 146/182] Perl 5.34 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 622b423..1957092 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 30%{?dist} +Release: 31%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -453,6 +453,9 @@ make check %changelog +* 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 From f2d0ac77ecd0d66d347484528b10fa04e656e0f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:34:13 +0000 Subject: [PATCH 147/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 942c4fb527334fe2feca3b4a521612fb3f8fc5a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:29:38 +0000 Subject: [PATCH 148/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 1957092..2a3cf01 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 31%{?dist} +Release: 32%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -453,6 +453,9 @@ make check %changelog +* 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 From 3cbbfc6466fa52f53f74aea788403dbd0ceb424a Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 18:58:26 +0200 Subject: [PATCH 149/182] Rebuilt with OpenSSL 3.0.0 --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 2a3cf01..13ca481 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 32%{?dist} +Release: 33%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -453,6 +453,9 @@ make check %changelog +* 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 From cdd038b8a850da5022298aaf824ff6450c0a0336 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:10:45 +0000 Subject: [PATCH 150/182] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 13ca481..bc60d2b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 33%{?dist} +Release: 34%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -453,6 +453,9 @@ make check %changelog +* 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 From b89dddec8cb55556c0d10430c6b78e2313db569b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 1 Jun 2022 10:49:13 +0200 Subject: [PATCH 151/182] Perl 5.36 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index bc60d2b..1e9812f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 34%{?dist} +Release: 35%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -453,6 +453,9 @@ make check %changelog +* 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 From 88246d12116afd38ca2863f689a5c0417ab474a7 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 7 Jul 2022 23:46:12 -0500 Subject: [PATCH 152/182] Add patch to fix bug which caused a failing test. Add patch from https://github.com/zmanda/amanda/pull/176 which fixes a bug that caused the hexencode test to fail. Thanks to Peter Bieringer. --- 176.patch | 26 ++++++++++++++++++++++++++ amanda.spec | 11 ++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 176.patch diff --git a/176.patch b/176.patch new file mode 100644 index 0000000..b9fd40a --- /dev/null +++ b/176.patch @@ -0,0 +1,26 @@ +From 262c05b20c7de243542e7502e00152cdafb573d4 Mon Sep 17 00:00:00 2001 +From: Peter Bieringer +Date: Wed, 6 Jul 2022 22:53:12 +0200 +Subject: [PATCH] fix for https://github.com/zmanda/amanda/issues/167 + +--- + common-src/amutil.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/common-src/amutil.c b/common-src/amutil.c +index 20454ab73c..371d38e433 100644 +--- a/common-src/amutil.c ++++ b/common-src/amutil.c +@@ -1132,6 +1132,12 @@ char *hexdecode_string(const char *str, GError **err) + new_len = orig_len = strlen(str); + for (i = 0; i < orig_len; i++) { + if (str[i] == '%') { ++ if (new_len < 2) { ++ g_set_error(err, am_util_error_quark(), AM_UTIL_ERROR_HEXDECODEINVAL, ++ "Invalid hexcode string: %s", str); ++ s = g_string_sized_new(0); ++ goto cleanup; ++ } + new_len -= 2; + } + } diff --git a/amanda.spec b/amanda.spec index 1e9812f..5e2a4bb 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 35%{?dist} +Release: 36%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -44,6 +44,11 @@ Patch6: patch-xfsrestore-housekeeping # Add missing extern keyword to global vars in header files Patch7: amanda-missing-extern.patch + +# Patch from upstream pull request https://github.com/zmanda/amanda/pull/176 +# to fix a bug which appears as a failing test case +Patch8: https://patch-diff.githubusercontent.com/raw/zmanda/amanda/pull/176.patch + License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org BuildRequires: automake autoconf libtool @@ -453,6 +458,10 @@ make check %changelog +* 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 From 27d698846ddd1096f807507c112bcea74b4d1a2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:42:34 +0000 Subject: [PATCH 153/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 5e2a4bb..28e47dc 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.1 -Release: 36%{?dist} +Release: 37%{?dist} Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -458,6 +458,9 @@ make check %changelog +* 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. From 6332968cab3899b9ec8e7d5ea2c79c194063f93f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Aug 2022 14:03:28 -0600 Subject: [PATCH 154/182] Update to 3.5.2 --- .gitignore | 1 + amanda.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1dc449d..314ea06 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ amanda-*.*.*/ /amanda-3.4.5.tar.gz /amanda-3.5.tar.gz /amanda-3.5.1.tar.gz +/amanda-3.5.2.tar.gz diff --git a/amanda.spec b/amanda.spec index 28e47dc..d043475 100644 --- a/amanda.spec +++ b/amanda.spec @@ -15,9 +15,9 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.5.1 -Release: 37%{?dist} -Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz +Version: 3.5.2 +Release: 1%{?dist} +Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist Source8: amandahosts @@ -127,7 +127,7 @@ 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. %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -p1 -n %{name}-tag-community-%{version} %build ./autogen @@ -165,11 +165,11 @@ pushd perl make maintainer-clean-am popd -make %{?_smp_mflags} +%make_build %install -make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT +%make_install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) mkdir -p $RPM_BUILD_ROOT/etc/amanda mkdir -p $RPM_BUILD_ROOT/var/log/amanda/amandad @@ -458,6 +458,9 @@ make check %changelog +* 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 diff --git a/sources b/sources index 2af25ca..1cc1e78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.5.1.tar.gz) = 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f +SHA512 (amanda-3.5.2.tar.gz) = 6c133455eeeef2a553d6a56431c34f431673c7d40dc8d07603edd464756386e9c1c3ef997d80a726e687cef20f4e30db4d760ba48b83ae047f7c72625505f391 From 8f46023b9a3f191edc4927a4e5a7d70515ab7740 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 30 Aug 2022 14:13:29 -0600 Subject: [PATCH 155/182] Add BR on rpcgen --- amanda.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/amanda.spec b/amanda.spec index d043475..afe6600 100644 --- a/amanda.spec +++ b/amanda.spec @@ -63,6 +63,7 @@ BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simpl BuildRequires: glib2-devel openssl-devel swig bison flex BuildRequires: libcurl-devel procps-ng systemd BuildRequires: make +BuildRequires: rpcgen Requires: grep tar /usr/bin/mail Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} From ea732a6bb3e765efdf10c84a9126c1eb1451c30f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 09:25:43 +0100 Subject: [PATCH 156/182] Remove perl(MODULE_COMPAT), it will be replaced by generators --- amanda.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index afe6600..905f909 100644 --- a/amanda.spec +++ b/amanda.spec @@ -65,7 +65,6 @@ BuildRequires: libcurl-devel procps-ng systemd BuildRequires: make BuildRequires: rpcgen Requires: grep tar /usr/bin/mail -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: amanda-libs%{?_isa} = %{version}-%{release} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig From c4608b08d6216f2137a143779ef28cee641abdd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:39:21 +0000 Subject: [PATCH 157/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 905f909..1a2fc68 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -458,6 +458,9 @@ make check %changelog +* 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 From 98173815c3c5047884536293312df0b5c1d08166 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Mar 2023 17:09:07 -0600 Subject: [PATCH 158/182] Update to 3.5.3 Fixes CVE-2022-37703 (bz#2126849) CVE-2022-37704 (bz#2168789) CVE-2022-37705 (bz#2168797) --- .gitignore | 1 + 176.patch | 26 -------------------------- amanda-missing-extern.patch | 13 ------------- amanda.spec | 20 ++++++++------------ sources | 2 +- 5 files changed, 10 insertions(+), 52 deletions(-) delete mode 100644 176.patch delete mode 100644 amanda-missing-extern.patch diff --git a/.gitignore b/.gitignore index 314ea06..7903fcf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ amanda-*.*.*/ /amanda-3.5.tar.gz /amanda-3.5.1.tar.gz /amanda-3.5.2.tar.gz +/amanda-3.5.3.tar.gz diff --git a/176.patch b/176.patch deleted file mode 100644 index b9fd40a..0000000 --- a/176.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 262c05b20c7de243542e7502e00152cdafb573d4 Mon Sep 17 00:00:00 2001 -From: Peter Bieringer -Date: Wed, 6 Jul 2022 22:53:12 +0200 -Subject: [PATCH] fix for https://github.com/zmanda/amanda/issues/167 - ---- - common-src/amutil.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/common-src/amutil.c b/common-src/amutil.c -index 20454ab73c..371d38e433 100644 ---- a/common-src/amutil.c -+++ b/common-src/amutil.c -@@ -1132,6 +1132,12 @@ char *hexdecode_string(const char *str, GError **err) - new_len = orig_len = strlen(str); - for (i = 0; i < orig_len; i++) { - if (str[i] == '%') { -+ if (new_len < 2) { -+ g_set_error(err, am_util_error_quark(), AM_UTIL_ERROR_HEXDECODEINVAL, -+ "Invalid hexcode string: %s", str); -+ s = g_string_sized_new(0); -+ goto cleanup; -+ } - new_len -= 2; - } - } diff --git a/amanda-missing-extern.patch b/amanda-missing-extern.patch deleted file mode 100644 index a036343..0000000 --- a/amanda-missing-extern.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common-src/testutils.h b/common-src/testutils.h -index 31f89737..2e9bb0b3 100644 ---- a/common-src/testutils.h -+++ b/common-src/testutils.h -@@ -75,7 +75,7 @@ typedef struct TestUtilsTest { - #define tu_dbg(...) if (tu_debugging_enabled) { g_fprintf(stderr, __VA_ARGS__); } - - /* Is debugging enabled for this test run? (set internally) */ --int tu_debugging_enabled; -+extern gboolean tu_debugging_enabled; - - /* - * Main loop diff --git a/amanda.spec b/amanda.spec index 1a2fc68..26ebe68 100644 --- a/amanda.spec +++ b/amanda.spec @@ -15,8 +15,8 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.5.3 +Release: 1%{?dist} Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -41,14 +41,6 @@ Patch5: patch-tirpc # https://bugzilla.redhat.com/show_bug.cgi?id=1671117 Patch6: patch-xfsrestore-housekeeping -# Add missing extern keyword to global vars in header files -Patch7: amanda-missing-extern.patch - - -# Patch from upstream pull request https://github.com/zmanda/amanda/pull/176 -# to fix a bug which appears as a failing test case -Patch8: https://patch-diff.githubusercontent.com/raw/zmanda/amanda/pull/176.patch - License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org BuildRequires: automake autoconf libtool @@ -225,8 +217,8 @@ make check %ldconfig_scriptlets server %files -%license COPYRIGHT -%doc NEWS README +%license COPYRIGHT COPYRIGHT.BSD +%doc ChangeLog NEWS README.md ReleaseNotes %{_unitdir}/amanda@.service %{_unitdir}/amanda.socket %{_unitdir}/amanda-udp.service @@ -458,6 +450,10 @@ make check %changelog +* 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 diff --git a/sources b/sources index 1cc1e78..4ee34d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.5.2.tar.gz) = 6c133455eeeef2a553d6a56431c34f431673c7d40dc8d07603edd464756386e9c1c3ef997d80a726e687cef20f4e30db4d760ba48b83ae047f7c72625505f391 +SHA512 (amanda-3.5.3.tar.gz) = 801575ea1f643c5ba37dd0991d8dfe13fe9266875ec6a11dbca8920435dd2e507bfcf830f750cfcd50725bbc52dc324d2af0be0f9b6194f9524a25406be11314 From 34167b5033b0f89baf4cc65eb427cbaca9d4ce04 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 17 Mar 2023 10:45:59 -0600 Subject: [PATCH 159/182] Drop BR on ncompress, it is not use for anything --- amanda.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 26ebe68..011bd4f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -50,7 +50,8 @@ BuildRequires: gnuplot %endif BuildRequires: cups samba-client tar grep BuildRequires: gcc-c++ readline-devel libtirpc-devel -BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st +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 procps-ng systemd From 7a8839fc14ef3702125c5b22b48c6a3fe7e991da Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 14 Apr 2023 15:53:19 +0200 Subject: [PATCH 160/182] Port configure script to C99 Related to: --- amanda-configure-c99.patch | 19 +++++++++++++++++++ amanda.spec | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 amanda-configure-c99.patch 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.spec b/amanda.spec index 011bd4f..b9858a3 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -40,6 +40,7 @@ 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 License: BSD and GPLv3+ and GPLv2+ and GPLv2 URL: http://www.amanda.org @@ -451,6 +452,9 @@ make check %changelog +* 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) From aeb78b663d04526a37fbfa717918106799bb4f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Tue, 2 May 2023 11:11:49 +0200 Subject: [PATCH 161/182] Move to SPDX license format --- amanda.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/amanda.spec b/amanda.spec index b9858a3..2025dbe 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -42,7 +42,7 @@ Patch5: patch-tirpc Patch6: patch-xfsrestore-housekeeping Patch7: amanda-configure-c99.patch -License: BSD and GPLv3+ and GPLv2+ and GPLv2 +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: xfsdump @@ -452,6 +452,9 @@ make check %changelog +* 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 From d4f0b2d449a672b1a5b766abc3c8af8c3983cd5c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 16:17:12 +0200 Subject: [PATCH 162/182] Perl 5.38 rebuild --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 2025dbe..1f4f958 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -452,6 +452,9 @@ make check %changelog +* 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 From b6de5a1e6ee2a3467f8d0f6971b822352cb502b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:11:25 +0000 Subject: [PATCH 163/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- amanda.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 1f4f958..04bacfc 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.3 -Release: 4%{?dist} +Release: 5%{?dist} Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -452,6 +452,9 @@ make check %changelog +* 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 From 3d0f76d936368be7298ac4b2322572a2a0e12bd9 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 26 Jul 2023 22:00:36 -0500 Subject: [PATCH 164/182] Convert to %autorelease and %autochangelog [skip changelog] --- amanda.spec | 895 +--------------------------------------------------- changelog | 891 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 893 insertions(+), 893 deletions(-) create mode 100644 changelog diff --git a/amanda.spec b/amanda.spec index 04bacfc..2ee1dd5 100644 --- a/amanda.spec +++ b/amanda.spec @@ -16,7 +16,7 @@ Summary: A network-capable tape backup solution Name: amanda Version: 3.5.3 -Release: 5%{?dist} +Release: %autorelease Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab Source4: disklist @@ -452,895 +452,4 @@ make check %changelog -* 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 - +%autochangelog 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 From eaa7c81541f45ff4b9ed15fd523343ffe9ee2bef Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 26 Jul 2023 22:34:47 -0500 Subject: [PATCH 165/182] Update to 3.5.4 This brings a security fix for CVE-2023-30577. Fixes #2226890 --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 2ee1dd5..001989f 100644 --- a/amanda.spec +++ b/amanda.spec @@ -15,7 +15,7 @@ Summary: A network-capable tape backup solution Name: amanda -Version: 3.5.3 +Version: 3.5.4 Release: %autorelease Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz Source1: amanda.crontab From 57211d59bd7d69039b2684897517b80b2b9e0c20 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 26 Jul 2023 22:47:25 -0500 Subject: [PATCH 166/182] Fix build of manpages Upstream unexpectedly stopped shipping preformatted manpages. This adds three build dependencies and a configure flag to build them. Fixes #2208319 --- amanda.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amanda.spec b/amanda.spec index 001989f..fce8145 100644 --- a/amanda.spec +++ b/amanda.spec @@ -58,6 +58,7 @@ BuildRequires: glib2-devel openssl-devel swig bison flex 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 @@ -128,6 +129,7 @@ server also needs to have the amanda-client package installed. export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pie" %configure --enable-shared \ + --enable-manpage-build \ --disable-rpath \ --disable-static \ --disable-dependency-tracking \ From 0102d7f8353603edb24675be5178ebac46adbff8 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 26 Jul 2023 22:52:58 -0500 Subject: [PATCH 167/182] Add sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7903fcf..631bcd4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ amanda-*.*.*/ /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/sources b/sources index 4ee34d3..08b3a3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amanda-3.5.3.tar.gz) = 801575ea1f643c5ba37dd0991d8dfe13fe9266875ec6a11dbca8920435dd2e507bfcf830f750cfcd50725bbc52dc324d2af0be0f9b6194f9524a25406be11314 +SHA512 (amanda-3.5.4.tar.gz) = 748491e36776a02a1497ce061588d40dfe6eceb6967b7ea7505c086e084aa1d6f69d8a581b46aa305d17c4e6eba28ba746aa178cb6ab97e1fd96ccdad5910824 From d9c69a38839b0e095101c9dcc96a0e90bf52945c Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 28 Nov 2023 19:51:50 +0100 Subject: [PATCH 168/182] Fix another C compatibility issue (upstream PR #242) --- amanda-c99.patch | 30 ++++++++++++++++++++++++++++++ amanda.spec | 1 + 2 files changed, 31 insertions(+) create mode 100644 amanda-c99.patch 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.spec b/amanda.spec index fce8145..043a607 100644 --- a/amanda.spec +++ b/amanda.spec @@ -41,6 +41,7 @@ Patch5: patch-tirpc # https://bugzilla.redhat.com/show_bug.cgi?id=1671117 Patch6: patch-xfsrestore-housekeeping Patch7: amanda-configure-c99.patch +Patch8: amanda-c99.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 From 365459cb2f82294dcd3c4919fb20829ece03aaab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:48:12 +0000 Subject: [PATCH 169/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e9e40fa558f6f9bd158667f31161fc7f75d83a4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:57:59 +0000 Subject: [PATCH 170/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 72e9d5ca09215e28c0f92c475a8805e8ed37492a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 10 Jun 2024 20:57:13 +0200 Subject: [PATCH 171/182] Perl 5.40 rebuild From 7e86a805119ed074d930983df788e025c0234aa9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:54:31 +0000 Subject: [PATCH 172/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2cad74e5bc02b2ef8735a0e758b8af24f314a091 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 11 Nov 2024 21:29:58 -0700 Subject: [PATCH 173/182] Drop nonexistent -s option from aflush man page (rhbz#1943909) --- 273.patch | 36 ++++++++++++++++++++++++++++++++++++ amanda.spec | 3 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 273.patch 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/amanda.spec b/amanda.spec index 043a607..1661734 100644 --- a/amanda.spec +++ b/amanda.spec @@ -36,12 +36,13 @@ Patch3: amanda-3.2.0-config-dir.patch 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 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 From 7d8defb7adaae2f6883fa024bdd5be9309a13c48 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 11 Nov 2024 21:42:07 -0700 Subject: [PATCH 174/182] Perl 5.40 support (rhbz#2322518) --- 270.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ amanda.spec | 4 +++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 270.patch 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/amanda.spec b/amanda.spec index 1661734..1fa5b50 100644 --- a/amanda.spec +++ b/amanda.spec @@ -42,7 +42,9 @@ 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 +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 From 7156f615df72bb69ca80908c34da4b55649a1af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:56:20 +0000 Subject: [PATCH 175/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a7570179e3a4107b3d9f3608045c503dd6600179 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 11 Feb 2025 18:42:36 -0600 Subject: [PATCH 176/182] Build with -std=c17. The code in ndmp-src is quite old and has many failures when built as C23. Fixing these will take some effort so the quick fix of building as C17 will work for now. An alternate quick fix would be to pass --without-ndmp to configure. --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 1fa5b50..5fd9ff0 100644 --- a/amanda.spec +++ b/amanda.spec @@ -131,7 +131,7 @@ server also needs to have the amanda-client package installed. %build ./autogen -export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pie" +export MAILER=/usr/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE -std=c17" LDFLAGS="$RPM_LD_FLAGS -pie" %configure --enable-shared \ --enable-manpage-build \ --disable-rpath \ From 3c88249265c6474f388a1481957e19317a63e991 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 11 Feb 2025 19:55:32 -0600 Subject: [PATCH 177/182] Fix absolute symlink This should silence the rpm complaint at the end of the build. --- amanda.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/amanda.spec b/amanda.spec index 5fd9ff0..045acfd 100644 --- a/amanda.spec +++ b/amanda.spec @@ -202,6 +202,11 @@ 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/amandad +popd + %check make check From f89594ead811ae6a658438d84abb83f1f7de61fc Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 13 Feb 2025 12:56:08 -0600 Subject: [PATCH 178/182] Fix unfortunate typo. --- amanda.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amanda.spec b/amanda.spec index 045acfd..e2c5b7e 100644 --- a/amanda.spec +++ b/amanda.spec @@ -204,7 +204,7 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm pushd $RPM_BUILD_ROOT/usr/bin rm amandad -ln -s ../%_lib/amandad +ln -s ../%_lib/amanda/amandad popd %check From 0803777d47b7171779dc8e5af1c7a6cfd5779664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:18 +0100 Subject: [PATCH 179/182] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- amanda.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/amanda.spec b/amanda.spec index e2c5b7e..73f8e9c 100644 --- a/amanda.spec +++ b/amanda.spec @@ -128,6 +128,12 @@ server also needs to have the amanda-client package installed. %prep %autosetup -p1 -n %{name}-tag-community-%{version} +# Create a sysusers.d config file +cat >amanda.sysusers.conf </dev/null 2>&1 || : -/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || : %post %{?ldconfig} @@ -299,6 +303,7 @@ make check %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 From e3de39913ac43747d1590124235b9e4574990bcd Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:24:46 +0200 Subject: [PATCH 180/182] Perl 5.42 rebuild From 656b46e5ce4cb00b6d60ebb8486c9e3f6244972f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:56:06 +0000 Subject: [PATCH 181/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b6b3c04ef57382423cca429cdc2f522df194c4d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:37:36 +0000 Subject: [PATCH 182/182] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild