Changes - j0ke.net Open Build Service

Changes of Revision 14

[-] [+]	Added	amanda.spec
@@ -0,0 +1,900 @@ +%define _libexecdir %{_libdir} +%{!?defconfig:%define defconfig DailySet1} +%{!?indexserver:%define indexserver amandahost} +%{!?tapeserver:%define tapeserver %{indexserver}} +%{!?amanda_user:%define amanda_user amandabackup} +%{!?amanda_group:%define amanda_group disk} + +Summary: A network-capable tape backup solution +Name: amanda +Version: 2.6.1p2 +Release: 8%{?dist} +Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz +#Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz +Source1: amanda.crontab +Source4: disklist +Source5: amanda-xinetd +Source8: amandahosts +Source9: README-rpm +Patch1: amanda-2.6.1p2-example.patch +Patch2: amanda-2.6.1p2-xattrs.patch +Patch3: amanda-2.6.0p2-tcpport.patch +Patch4: amanda-2.6.0b3-lib.patch +Patch5: amanda-2.6.1p2-pie.patch +Patch6: amanda-2.6.1p2-ftbfs.patch +Patch7: amanda-2.6.1p2-optionk.patch +Patch8: amanda-2.6.1p2-amold.patch +License: BSD and LGPLv2 and GPLv3+ 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 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: glib2-devel openssl-devel swig bison flex +BuildRequires: libcurl-devel +Requires(pre): shadow-utils +Requires(post): grep sed +Requires: amanda-client = %{version}-%{release} +Requires: fileutils grep initscripts tar /bin/mail xinetd +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%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 +tape drives or disk files. AMANDA uses native dump and/or GNU tar +facilities and can back up a large number of workstations running +multiple versions of Unix. Newer versions of AMANDA (including this +version) can use SAMBA to back up Microsoft(TM) Windows95/NT hosts. +The amanda package contains the core AMANDA programs and will need to +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 client +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 +be backed up by AMANDA (including the server if it also needs to be +backed up). You will also need to install the amanda package on each +AMANDA client machine. + +%package server +Summary: The server side of the AMANDA tape backup system +Group: Applications/System +Requires: fileutils grep /sbin/service +Requires(pre): amanda = %{version}-%{release} +Requires(post): grep sed findutils + +%description server +The amanda-server package should be installed on the AMANDA server, +the machine attached to the device(s) (such as a tape drive) where backups +will be written. You will also need to install the amanda package on +the AMANDA server machine. And, if the server is also to be backed up, the +server also needs to have the amanda-client package installed. + +%package devel +Summary: Libraries and documentation of the AMANDA tape backup system +Group: Development/Libraries +Requires(pre): amanda = %{version}-%{release} + +%description devel +The amanda-devel package should be installed on any machine that will +be used to develop amanda applications. + +#%%define _default_patch_fuzz 3 + +%prep +%setup -q -n %{name}-%{version} +%patch1 -p1 -b .example +%patch2 -p1 -b .xattrs +%patch3 -p1 -b .tcpport +%patch4 -p1 -b .lib +%patch5 -p1 -b .pie +%patch6 -p1 -b .ftbfs +%patch7 -p1 -b .optionk +%patch8 -p1 -b .amold +./autogen + +%build +export MAILER=/bin/mail + +%configure --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 + +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 + +mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d +perl -p -e "s,\@LIBEXECDIR\@,%{_libexecdir},g" < %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} +#popd + +ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8 + +pushd ${RPM_BUILD_ROOT} + mv .%{_sysconfdir}/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 + + mkdir -p .%{_localstatedir}/lib/amanda/gnutar-lists + mkdir -p .%{_localstatedir}/lib/amanda/%defconfig/index + touch .%{_localstatedir}/lib/amanda/amandates +popd +rm -rf $RPM_BUILD_ROOT/usr/share/amanda +find $RPM_BUILD_ROOT -name \.la \| xargs rm + +%check +make check + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%pre +# look for user 'amanda' with uid 33, if exists, rename to new %amanda_user +getent passwd 'amanda' \| grep ':33:' >/dev/null && +usermod -l %amanda_user amanda >/dev/null 2>&1 && +mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null + +/usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \ + -c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 \|\| : +/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 \|\| : + +%post +/sbin/ldconfig +# when upgrading and /etc/xinet.d/amanda contains obsolete user name, update it +[ $1 -eq 2 ] && + grep -E '^[[:blank:]]user[[:blank:]]=[[:blank:]]amanda[[:blank:]]$' /etc/xinetd.d/amanda &>/dev/null && + sed -i.rpmsave -r -e 's/^([[:blank:]]user[[:blank:]]=[[:blank:]])amanda([[:blank:]])$/\1%amanda_user\2/' /etc/xinetd.d/amanda \|\| : + +[ -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 &&
[-] [+]	Added	amanda-2.6.0b3-lib.patch ^
@@ -0,0 +1,31 @@ +--- 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. ])
[-] [+]	Added	amanda-2.6.0p2-tcpport.patch ^
@@ -0,0 +1,21 @@ +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
[-] [+]	Added	amanda-2.6.1p2-amold.patch ^
@@ -0,0 +1,29 @@ +diff -up amanda-2.6.1p2/man/amrecover.8.amold amanda-2.6.1p2/man/amrecover.8 +--- amanda-2.6.1p2/man/amrecover.8.amold 2009-11-05 21:15:15.000000000 +0100 ++++ amanda-2.6.1p2/man/amrecover.8 2010-06-23 12:25:43.165723523 +0200 +@@ -23,6 +23,8 @@ amrecover \- \fIAmanda\fR index database + .SH "SYNOPSIS" + .HP \w'\fBamrecover\fR\ 'u + \fBamrecover\fR [\-C\ \fIconfig\fR] [\-s\ \fIindex\-server\fR] [\-t\ \fItape\-server\fR] [\-d\ \fItape\-device\fR] [\-o\ \fIconfigoption\fR]... ++.HP \w'\fBamoldrecover\fR\ 'u ++\fBamoldrecover\fR [\-C\ \fIconfig\fR] [\-s\ \fIindex\-server\fR] [\-t\ \fItape\-server\fR] [\-d\ \fItape\-device\fR]... + .SH "DESCRIPTION" + .PP + \fBAmrecover\fR +@@ -43,6 +45,8 @@ file and the + file\&. If no configuration name is supplied on the command line, Amrecover will try the compiled\-in default configuration ,usually + \fBDailySet1\fR\&. + .PP ++Amanda 2.5.1 introduced a new recover protocol. Backup communication works with any combination of versions, but 2.5.1´s amrecover cannot communicate with an older server. Use amoldrecover on 2.5.1 and higher clients when communicating with an older server. ++.PP + See the + \fBamanda\fR(8) + man page for more details about +@@ -495,3 +499,7 @@ If set, $AMANDA_TAPE_SERVER will be used + \fBAlan M\&. McIvor\fR <\&alan@kauri\&.auck\&.irl\&.cri\&.nz\&> + .PP + \fBStefan G\&. Weichinger\fR <\&sgw@amanda\&.org\&> ++.PP ++\fBDustin J\&. Mitchell\fR <\&dustin@zmanda\&.com\&> ++.RS 4 ++Zmanda, Inc\&. (http://www\&.zmanda\&.com)
[-] [+]	Added	amanda-2.6.1p2-example.patch ^
@@ -0,0 +1,16 @@ +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 \
[-] [+]	Added	amanda-2.6.1p2-ftbfs.patch ^
@@ -0,0 +1,12 @@ +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
[-] [+]	Added	amanda-2.6.1p2-optionk.patch ^
@@ -0,0 +1,11 @@ +diff -up amanda-2.6.1p2/restore-src/amfetchdump.c.optionk amanda-2.6.1p2/restore-src/amfetchdump.c +--- amanda-2.6.1p2/restore-src/amfetchdump.c.optionk 2009-05-22 21:20:45.000000000 +0200 ++++ amanda-2.6.1p2/restore-src/amfetchdump.c 2010-05-28 11:35:22.746890186 +0200 +@@ -89,7 +89,6 @@ usage(void) + g_fprintf(stderr, _(" -i <dst_file> Search through tapes and write out an inventory while we\n restore. Useful only if normal logs are unavailable.\n")); + g_fprintf(stderr, _(" -w Wait to put split dumps together until all chunks have been restored.\n")); + g_fprintf(stderr, _(" -n Do not reassemble split dumpfiles.\n")); +- g_fprintf(stderr, _(" -k Skip the rewind/label read when reading a new tape.\n")); + g_fprintf(stderr, _(" -s Do not use fast forward to skip files we won't restore. Use only if fsf\n causes your tapes to skip too far.\n")); + g_fprintf(stderr, _(" -b <blocksize> Force a particular block size (default is 32kb).\n")); + exit(1);
[-] [+]	Added	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
[-] [+]	Added	amanda-2.6.1p2-xattrs.patch ^
@@ -0,0 +1,61 @@ +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_exclude2)+(nb_include2))); ++ my_argv = alloc(SIZEOF(char ) (23 + (nb_exclude2)+(nb_include2))); + + 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"; +
[-] [+]	Added	README-rpm ^
@@ -0,0 +1,12 @@ +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...
	Added	amanda-2.6.1p2.tar.gz ^
[-] [+]	Added	amanda-xinetd ^
@@ -0,0 +1,23 @@ +# default: off +# description: The client for the Amanda backup system.\ +# This must be on for systems being backed up\ +# by Amanda. + +service amanda +{ + socket_type = dgram + protocol = udp + wait = yes + user = amandabackup + group = disk + server = /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=bsd amdump + disable = yes +}
[-] [+]	Added	amanda.crontab ^
@@ -0,0 +1,9 @@ +# This is an example for a crontab entry for automated backup with amanda +# With these cron lines, Amanda will check that the correct tape is in +# the drive every weekday afternoon at 4pm (if it isn't, all the +# operators will get mail). At 12:45am that night the dumps will be run. +# +# This should be put in user operator's crontab +# +0 16 * * 1-5 /usr/sbin/amcheck -m DailySet1 +45 0 * * 2-6 /usr/sbin/amdump DailySet1
[-] [+]	Added	amandahosts ^
@@ -0,0 +1,29 @@ +# Allow access to amanda over the network. See 'man amanda' + +# 'ambackup' connects to 'amandad'. If your 'disklist' is correctly +# set up, i.e. if it does not use 'localhost' but the fully qualified +# domain name (FQDN) of the target machine, then you must put +# the FQDN here. 'ambackup' must be run by user 'amandabackup', so we allow +# access by user 'amandabackup'. Do not forget to add an 'only_from' line to +# '/etc/xinet.d/amanda' to allow access to 'amandad' only from known +# IP addresses. + +# replace mymachine.mydomain by the correct value and uncomment +# mymachine.mydomain amandabackup + + +# 'amrecover' connects to 'amandaidx', which uses the fully qualified +# domain name when access is done from another machine. 'amrecover' +# must be run by user 'root', so we allow access by user 'root'. + +# replace mymachine.mydomain by the correct value and uncomment +# mymachine.mydomain root + + +# 'amrecover' connects to 'amandaidx', which uses the bare machine +# name w/o domain name when access is done from the same machine. +# 'amrecover' must be run by user 'root', so we allow access by user +# 'root'. + +# replace mymachine by the correct value and uncomment +# mymachine root
[-] [+]	Added	disklist ^
@@ -0,0 +1,69 @@ +# sample Amanda2 disklist file, derived from CS.UMD.EDU's disklist +# +# If your configuration is called, say, "csd2", then this file normally goes +# in /etc/amanda/csd2/disklist. +# +# File format is: +# +# hostname diskdev dumptype +# +# where the dumptypes are defined by you in amanda.conf. + + +# At our site, root partitions have a different dumptype because they +# are of lower priority; they don't contain user data, and don't change +# much from the department prototype. In a crunch, they can be left for +# last or skipped. + +## A SPARCstation 1+ +#salty sd0a comp-root +#salty sd0g comp-user +#salty sd1g comp-user +#salty sd2a comp-root +#salty sd2g comp-user +#salty sd3c comp-user +# +## A DECstation 3100 +#slithy rz1a comp-root +#slithy rz1g comp-user +#slithy rz3a comp-root +#slithy rz3g comp-user +# +## We don't run compression on the master host since it is going to be +## busy enough running amanda. +#master sd0a nocomp-root -1 local +#master sd0g nocomp-user -1 local +## note: -1 is a placeholder for the spindle number +## the holding disk can't be dumped to itself, it uses a disktype that +## specifies the "no-hold" option (see amanda.conf). +#master sd1c holding-disk -1 local +# +## The chairman's disk is high priority to make sure it gets done. +#bigwig sd0a comp-root +#bigwig sd0g comp-high +## Likewise the named databases in the root partition on our primary +## nameserver. Also, compression is turned off because we don't want +## to create any unnecessary load on this baby (it's only a Sun3). +#bozo sd0a nocomp-high +#bozo sd0g nocomp-user +#bozo sd4c nocomp-user +# +## Dump Joe's NetBSD machine, with the mounted MS-DOS partition dumped +## using tar. +#joespc wd0a comp-root +#joespc wd0e comp-user +#joespc /msdos comp-user-tar +# +## Some really slow machines, like Sun2's and some Vaxstations, take +## forever to compress their dumps: it's just not worth it. +# +## A Sun2 +#cleo sd0a nocomp-root +#cleo sd0g nocomp-user +## A VaxStation +#susie rz8a nocomp-root +#susie rz8g nocomp-user +# +## and so on ... well, you get the idea + +localhost /etc comp-root-tar