rpms/amanda/devel amanda-2.6.0b2-xattrs.patch, NONE, 1.1 amanda-2.6.0b3-example.patch, NONE, 1.1 amanda-2.6.0b3-lib.patch, NONE, 1.1 amanda-2.6.0p2-pie.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 amanda-xinetd, 1.5, 1.6 amanda.spec, 1.51, 1.52 sources, 1.15, 1.16
Daniel Novotny
dnovotny at fedoraproject.org
Mon Oct 20 10:34:30 UTC 2008
- Previous message: rpms/libgphoto2/devel .cvsignore, 1.5, 1.6 libgphoto2.spec, 1.13, 1.14 sources, 1.5, 1.6
- Next message: rpms/cluster/devel .cvsignore, 1.11, 1.12 cluster.spec, 1.23, 1.24 sources, 1.11, 1.12 cman_init_fix-0c80e08741cb.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dnovotny
Update of /cvs/pkgs/rpms/amanda/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23845
Modified Files:
.cvsignore amanda-xinetd amanda.spec sources
Added Files:
amanda-2.6.0b2-xattrs.patch amanda-2.6.0b3-example.patch
amanda-2.6.0b3-lib.patch amanda-2.6.0p2-pie.patch
Log Message:
rebase to 2.6.0p2
amanda-2.6.0b2-xattrs.patch:
--- NEW FILE amanda-2.6.0b2-xattrs.patch ---
--- 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";
amanda-2.6.0b3-example.patch:
--- NEW FILE amanda-2.6.0b3-example.patch ---
--- 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 \
amanda-2.6.0b3-lib.patch:
--- NEW FILE amanda-2.6.0b3-lib.patch ---
--- 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. ])
amanda-2.6.0p2-pie.patch:
--- NEW FILE amanda-2.6.0p2-pie.patch ---
--- 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 \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 21 Jun 2007 09:37:50 -0000 1.15
+++ .cvsignore 20 Oct 2008 10:33:59 -0000 1.16
@@ -1 +1 @@
-amanda-2.5.2p1.tar.gz
+amanda-2.6.0p2.tar.gz
Index: amanda-xinetd
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/devel/amanda-xinetd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- amanda-xinetd 20 Aug 2008 09:12:48 -0000 1.5
+++ amanda-xinetd 20 Oct 2008 10:33:59 -0000 1.6
@@ -10,7 +10,7 @@
wait = yes
user = amandabackup
group = disk
- server = @LIBDIR@/amandad
+ server = @LIBEXECDIR@/amanda/amandad
# Configure server_args for the authentication type you will be using,
# and the services you wish to allow the amanda server and/or recovery
# clients to use.
Index: amanda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- amanda.spec 15 Oct 2008 13:40:12 -0000 1.51
+++ amanda.spec 20 Oct 2008 10:33:59 -0000 1.52
@@ -1,40 +1,38 @@
-%define _libexecdir %{_libdir}/amanda
%{!?defconfig:%define defconfig DailySet1}
%{!?indexserver:%define indexserver amandahost}
%{!?tapeserver:%define tapeserver %{indexserver}}
%{!?amanda_user:%define amanda_user amandabackup}
%{!?amanda_group:%define amanda_group disk}
-# XXX append lib to current _localstatedir setting
-%{expand: %%define _localstatedir %{_localstatedir}/lib}
-
Summary: A network-capable tape backup solution
Name: amanda
-Version: 2.5.2p1
-Release: 13%{?dist}
-Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
+Version: 2.6.0p2
+Release: 2%{?dist}
+Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
+#Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz
Source1: amanda.crontab
Source4: disklist
Source5: amanda-xinetd
Source8: amandahosts
Source9: README-rpm
-Patch1: amanda-2.5.2p1-pie.patch
-Patch3: amanda-2.5.2p1-ylwrapNotFound.patch
-Patch4: amanda-2.5.2p1-undefSymbols.patch
-Patch5: amanda-2.5.2p1-xattrs.patch
-Patch6: amanda-2.5.2p1-typo_chg_multi.patch
-Patch7: amanda-2.5.2p1-configure.patch
-Patch8: amanda-2.5.2p1-tcpport.patch
+Patch1: amanda-2.6.0b3-example.patch
+Patch2: amanda-2.6.0b2-xattrs.patch
+Patch4: amanda-2.6.0b3-lib.patch
+Patch5: amanda-2.6.0p2-pie.patch
License: BSD
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: libtool automake autoconf gcc-c++ readline-devel /usr/bin/Mail
+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
Requires(pre): shadow-utils
Requires(post): grep sed
-Requires: fileutils grep initscripts tar /usr/bin/Mail
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+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
@@ -50,9 +48,9 @@
well.
%package client
-Summary: The client component of the AMANDA tape backup system.
+Summary: The client component of the AMANDA tape backup system
Group: Applications/System
-Requires: fileutils grep /sbin/service xinetd
+Requires: fileutils grep /sbin/service
Requires(pre): amanda = %{version}
Requires(post): grep sed
@@ -63,7 +61,7 @@
AMANDA client machine.
%package server
-Summary: The server side of the AMANDA tape backup system.
+Summary: The server side of the AMANDA tape backup system
Group: Applications/System
Requires: fileutils grep /sbin/service
Requires(pre): amanda = %{version}
@@ -77,7 +75,7 @@
server also needs to have the amanda-client package installed.
%package devel
-Summary: Libraries and documentation of the AMANDA tape backup system.
+Summary: Libraries and documentation of the AMANDA tape backup system
Group: Development/Libraries
Requires(pre): amanda = %{version}
@@ -86,29 +84,29 @@
be used to develop amanda applications.
%prep
-%setup -q
-%patch1 -p1 -b .pie
-%patch3 -p1 -b .ylwrapNotFound
-%patch4 -p1 -b .undefSymbols
-%patch5 -p1 -b .xattrs
-%patch6 -p1 -b .typo_chg_multi
-%patch7 -p1 -b .configure
-%patch8 -p1 -b .tcpport
+%setup -q -n %{name}-%{version}
+%patch1 -p1 -b .example
+%patch2 -p1 -b .xattrs
+%patch4 -p1 -b .lib
+%patch5 -p1 -b .pie
./autogen
%build
-export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE"
-export SED=sed
+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}/amanda/gnutar-lists \
+ --with-gnutar-listdir=%{_localstatedir}/lib/amanda/gnutar-lists \
--with-smbclient=%{_bindir}/smbclient \
- --with-dumperdir=%{_libdir}/amanda/dumperdir \
+ --with-amandates=%{_localstatedir}/lib/amanda/amandates \
--with-amandahosts \
--with-user=%amanda_user \
--with-group=%amanda_group \
@@ -118,29 +116,23 @@
--with-rsh-security \
--with-bsdtcp-security \
--with-bsdudp-security \
- --with-krb5-security \
-# --with-tcpportrange=1025,65535
+ --with-krb5-security
make %{?_smp_mflags}
%install
rm -rf ${RPM_BUILD_ROOT}
-export SED=sed
+#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,\@LIBDIR\@,%{_libexecdir},g" < %SOURCE5 > $RPM_BUILD_ROOT/etc/xinetd.d/amanda
+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}/amanda
-install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/amanda/.amandahosts
-
-mkdir -p examples
-cp example/* examples
-rm -f examples/Makefile*
-rm -f examples/config.site
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda
+install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts
cp %SOURCE9 .
@@ -148,27 +140,21 @@
install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir}
popd
-rm -r ${RPM_BUILD_ROOT}%{_libdir}/amanda/dumperdir
-rmdir --ignore-fail-on-non-empty ${RPM_BUILD_ROOT}%{_libdir}/amanda
-
pushd ${RPM_BUILD_ROOT}
- mkdir -p .%{_sysconfdir}/amanda/%defconfig
+ 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_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig}
- cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda-client.conf .%{_sysconfdir}/amanda/%{defconfig}
cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
- touch .%{_sysconfdir}/amandates
-
- mkdir -p .%{_localstatedir}/amanda/gnutar-lists
- mkdir -p .%{_localstatedir}/amanda/%defconfig/index
- chmod 755 .%{_libdir}/libam*
+ mkdir -p .%{_localstatedir}/lib/amanda/gnutar-lists
+ mkdir -p .%{_localstatedir}/lib/amanda/%defconfig/index
+ touch .%{_localstatedir}/lib/amanda/amandates
popd
-cp examples/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda/%{defconfig}
-cp examples/amanda-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda/%{defconfig}
rm -rf $RPM_BUILD_ROOT/usr/share/amanda
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+find $RPM_BUILD_ROOT -name \*.la | xargs rm
+
+%check
+make check
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -179,24 +165,32 @@
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}/amanda -s /bin/bash \
+/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 || :
%post
/sbin/ldconfig
-# 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 || :
-
-%post client
-/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 &&
+ grep -E '^[[:blank:]]*user[[:blank:]]*=[[:blank:]]*amanda[[:blank:]]*$' /etc/xinetd.d/amanda &>/dev/null &&
sed -i.usernameupdate -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
@@ -206,82 +200,84 @@
grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
xargs sed -i.usernameupdate -r -e 's/^(dumpuser[[:blank:]]*)"amanda"/\1"%amanda_user"/' &>/dev/null || :
-%postun -p /sbin/ldconfig
-
-%postun client
-/sbin/ldconfig
-[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || :
+%postun client -p /sbin/ldconfig
-%postun server
-/sbin/ldconfig
+%postun server -p /sbin/ldconfig
%files
%defattr(-,root,root)
- %{_libdir}/libamanda-*.so
+ %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
+%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/
+%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore
%{_mandir}/man8/amrestore.8*
-%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/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}/amanda/
+%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/
%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amandates
+%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/%defconfig
%doc README-rpm
%{_mandir}/man5/amanda.conf*
%files server
%defattr(-,root,root)
-%doc examples COPYRIGHT* NEWS README
-%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amidxtaped
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amindexd
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amlogroll
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amtrmidx
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amtrmlog
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/driver
-%attr(4750,root,%amanda_group) %{_libexecdir}/dumper
-%attr(4750,root,%amanda_group) %{_libexecdir}/planner
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/taper
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chunker
-#%attr(-,%amanda_user,%amanda_group) %dir %{_libdir}/amanda
-#%attr(-,%amanda_user,%amanda_group) %dir %{_libdir}/amanda/dumperdir
-#%attr(-,%amanda_user,%amanda_group) %{_libdir}/amanda/dumperdir/generic-dumper
-#%attr(-,%amanda_user,%amanda_group) %{_libdir}/amanda/dumperdir/gnutar
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amcleanupdisk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-chio
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-chs
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-juke
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-manual
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-mcutil
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-mtx
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-multi
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-null
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-rait
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-rth
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-scsi
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-zd-mtx
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-disk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-iomega
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-lib.sh
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amcat.awk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.awk
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.g
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.gp
+%doc COPYRIGHT* NEWS README
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amidxtaped
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amindexd
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amlogroll
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmidx
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmlog
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/driver
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chunker
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chio
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chs
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-manual
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mcutil
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mtx
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-multi
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-null
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rait
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rth
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-scsi
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-zd-mtx
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-iomega
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.awk
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.g
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.gp
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin
%attr(4750,root,%amanda_group) %{_sbindir}/amcheck
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf
+%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport
@@ -292,6 +288,7 @@
%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
@@ -299,31 +296,38 @@
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/ammt
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amverifyrun
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/amanda/%defconfig/
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/amanda/%defconfig/index
+%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) %dir %{_sysconfdir}/amanda/%defconfig
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda.conf
%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/disklist
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
+%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
+%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d
+%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/*
%{_mandir}/man8/amadmin.8*
%{_mandir}/man8/amaespipe.8*
+%{_mandir}/man8/amaddclient.8*
%{_mandir}/man8/amanda.8*
%{_mandir}/man8/amcheck.8*
%{_mandir}/man8/amcheckdb.8*
+%{_mandir}/man8/amcheckdump.8*
%{_mandir}/man8/amcleanup.8*
%{_mandir}/man8/amcrypt.8*
+%{_mandir}/man8/amcryptsimple.8*
%{_mandir}/man8/amdd.8*
+%{_mandir}/man8/amdevcheck.8*
%{_mandir}/man8/amdump.8*
%{_mandir}/man8/amflush.8*
%{_mandir}/man8/amgetconf.8*
+%{_mandir}/man8/amgpgcrypt.8*
%{_mandir}/man8/amlabel.8*
%{_mandir}/man8/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*
@@ -335,31 +339,33 @@
%files client
%defattr(-,root,root)
- %config(noreplace) /etc/xinetd.d/amanda
-%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/noop
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amandad
-%attr(4750,root,%amanda_group) %{_libexecdir}/calcsize
-%attr(4750,root,%amanda_group) %{_libexecdir}/killpgrp
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/patch-system
-%attr(4750,root,%amanda_group) %{_libexecdir}/rundump
-%attr(4750,root,%amanda_group) %{_libexecdir}/runtar
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/selfcheck
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/sendbackup
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/sendsize
-%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/versionsuffix
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/application/
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/noop
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/patch-system
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/selfcheck
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendbackup
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendsize
+%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/versionsuffix
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump
%{_mandir}/man8/amfetchdump.8*
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover
%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover
%{_mandir}/man8/amrecover.8*
%{_mandir}/man5/amanda-client.conf.5*
-%attr(-,%amanda_user,%amanda_group) %{_localstatedir}/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
%files devel
%defattr(-,root,root)
+%{_includedir}/amanda/
%{_libdir}/libamanda.so
+%{_libdir}/libamdevice.so
%{_libdir}/libamtape.so
%{_libdir}/libamclient.so
%{_libdir}/libamserver.so
@@ -367,20 +373,46 @@
%{_libdir}/libamandad.so
%changelog
-* Wed Oct 15 2008 Daniel Novotny <dnovotny at redhat.com> 2.5.2.p1-13
-- --with-tcpportrange removed again (people getting AVC denies, #462681)
- #448071 re-solved with amanda.conf patch
-
-* Wed Aug 27 2008 Daniel Novotny <dnovotny at redhat.com> 2.5.2.p1-11
-- new Autoconf 2.62 requires changes in Autoconf macros
- (resolves #449479)
-
-* Thu Aug 21 2008 Daniel Novotny <dnovotny at redhat.com> 2.5.2.p1-11
-- Username in /etc/xinetd.d/amanda has to be changed
- to 'amandabackup' because of the change from Thu Nov 22 2007
- (resolves #448071)
-- Added --with-tcpportrange=1025,65535 to ./configure options
- (resolves #449764)
+* Fri Oct 10 2008 Orion Poplawski <orion at cora.nwra.com> 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 <orion at cora.nwra.com> 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 <orion at cora.nwra.com> 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 <orion at cora.nwra.com> 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 <orion at cora.nwra.com> 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 <rbrich at redhat.com> 2.5.2.p1-10
- do not require gnuplot by -server subpackage (bz#433101)
@@ -714,7 +746,7 @@
- applied patch so that it reports the available holding disk space correctly
* Thu Jul 8 1999 Tim Powers <timp at redhat.com>
-- added %defattr lines
+- added %%defattr lines
- rebuilt for 6.1
* Wed May 05 1999 Bill Nottingham <notting at redhat.com>
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amanda/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 21 Jun 2007 09:37:50 -0000 1.15
+++ sources 20 Oct 2008 10:33:59 -0000 1.16
@@ -1 +1 @@
-da1234b12e1e34f8535f1c6269d27788 amanda-2.5.2p1.tar.gz
+75dcba5a75327ebcd4f197a93b8e8c9c amanda-2.6.0p2.tar.gz
- Previous message: rpms/libgphoto2/devel .cvsignore, 1.5, 1.6 libgphoto2.spec, 1.13, 1.14 sources, 1.5, 1.6
- Next message: rpms/cluster/devel .cvsignore, 1.11, 1.12 cluster.spec, 1.23, 1.24 sources, 1.11, 1.12 cman_init_fix-0c80e08741cb.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list