[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/amanda/devel amanda-2.5.0-overflow.patch, NONE, 1.1 amanda-2.5.0-pie.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 amanda.spec, 1.28, 1.29 amandahosts, 1.1, 1.2 sources, 1.10, 1.11



Author: fenlason

Update of /cvs/dist/rpms/amanda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3992

Modified Files:
	.cvsignore amanda.spec amandahosts sources 
Added Files:
	amanda-2.5.0-overflow.patch amanda-2.5.0-pie.patch 
Log Message:
2.5.0 with tape-spanning goodness.


amanda-2.5.0-overflow.patch:
 driver.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE amanda-2.5.0-overflow.patch ---
diff -u -r --show-c-function --exclude-from=amanda.diff amanda-2.5.0.orig/server-src/driver.c amanda-2.5.0.new.overflow/server-src/driver.c
--- amanda-2.5.0.orig/server-src/driver.c	2006-03-28 16:10:05.000000000 -0500
+++ amanda-2.5.0/server-src/driver.c	2006-04-03 10:42:32.000000000 -0400
@@ -1466,7 +1466,7 @@ handle_chunker_result(cookie)
 		chunker_cmd( chunker, CONTINUE, dp );
 	    } else { /* !h[++activehd] - must allocate more space */
 		sched(dp)->act_size = sched(dp)->est_size; /* not quite true */
-		sched(dp)->est_size = sched(dp)->act_size * 21 / 20; /* +5% */
+		sched(dp)->est_size = (sched(dp)->act_size/20) * 21; /* +5% */
 		sched(dp)->est_size = am_round(sched(dp)->est_size, DISK_BLOCK_KB);
 		h = find_diskspace( sched(dp)->est_size - sched(dp)->act_size,
 				    &dummy,

amanda-2.5.0-pie.patch:
 amanda-2.4.4p1.pie/configure.in      |   46 +++++++++++++++++++++++++++++++++++
 amanda-2.5.0/changer-src/Makefile.am |    4 +++
 amanda-2.5.0/client-src/Makefile.am  |   21 +++++++++++++++
 amanda-2.5.0/restore-src/Makefile.am |    7 +++++
 amanda-2.5.0/server-src/Makefile.am  |   37 ++++++++++++++++++++++++++++
 amanda-2.5.0/tape-src/Makefile.am    |    7 +++++
 config/compile                       |    1 
 7 files changed, 123 insertions(+)

--- NEW FILE amanda-2.5.0-pie.patch ---
diff -u -r amanda-2.4.4p1.old/configure.in amanda-2.4.4p1/configure.in
--- amanda-2.4.4p1.old/configure.in	2003-06-27 10:19:53.000000000 -0400
+++ amanda-2.4.4p1.pie/configure.in	2003-07-08 23:54:13.000000000 -0400
@@ -2469,6 +2469,52 @@
 AC_REPLACE_FUNCS(strcasecmp)
 ICE_CHECK_DECL(strcasecmp,string.h strings.h)
 
+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.4.4p1.orig/config/compile	1969-12-31 19:00:00.000000000 -0500
+++ amanda-2.4.4p1.pie/config/compile	2003-07-16 16:57:18.000000000 -0400
@@ -0,0 +1 @@
+# Dummy compile for configure
--- amanda-2.5.0/server-src/Makefile.am.pie	2006-02-14 06:51:24.000000000 -0500
+++ amanda-2.5.0/server-src/Makefile.am	2006-04-07 15:27:09.000000000 -0400
@@ -12,11 +12,48 @@
 			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
 
+
+taper_CFLAGS = -fPIE $(AM_CFLAGS)
+taper_LDFLAGS = -pie $(AM_LDFLAGS)
+driver_CFLAGS = -fPIE $(AM_CFLAGS)
+driver_LDFLAGS = -pie $(AM_LDFLAGS)
+chunker_CFLAGS = -fPIE $(AM_CFLAGS)
+chunker_LDFLAGS = -pie $(AM_LDFLAGS)
+amtrmlog_CFLAGS = -fPIE $(AM_CFLAGS)
+amtrmlog_LDFLAGS = -pie $(AM_LDFLAGS)
+amtrmidx_CFLAGS = -fPIE $(AM_CFLAGS)
+amtrmidx_LDFLAGS = -pie $(AM_LDFLAGS)
+amlogroll_CFLAGS = -fPIE $(AM_CFLAGS)
+amlogroll_LDFLAGS = -pie $(AM_LDFLAGS)
+amcleanupdisk_CFLAGS = -fPIE $(AM_CFLAGS)
+amcleanupdisk_LDFLAGS = -pie $(AM_LDFLAGS)
+amindexd_CFLAGS = -fPIE $(AM_CFLAGS)
+amindexd_LDFLAGS = -pie $(AM_LDFLAGS)
+dumper_CFLAGS = -fPIE $(AM_CFLAGS)
+dumper_LDFLAGS = -pie $(AM_LDFLAGS)
+planner_CFLAGS = -fPIE $(AM_CFLAGS)
+planner_LDFLAGS = -pie $(AM_LDFLAGS)
+
 sbin_SCRIPTS =		amcheckdb	amcleanup	amdump		\
 			amoverview	amrmtape	amtoc		\
 			amverify	amverifyrun	amstatus	\
--- amanda-2.5.0/changer-src/Makefile.am.pie	2006-04-07 15:28:32.000000000 -0400
+++ amanda-2.5.0/changer-src/Makefile.am	2006-04-07 15:30:09.000000000 -0400
@@ -9,10 +9,14 @@
 
 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)
--- amanda-2.5.0/client-src/Makefile.am.pie	2006-02-14 06:51:20.000000000 -0500
+++ amanda-2.5.0/client-src/Makefile.am	2006-04-07 15:33:17.000000000 -0400
@@ -8,6 +8,27 @@
 
 libexec_PROGRAMS =	amandad noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix
 
+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)
+amandad_CFLAGS = -fPIE $(AM_CFLAGS)
+amandad_LDFLAGS = -pie $(AM_LDFLAGS)
+noop_CFLAGS = -fPIE $(AM_CFLAGS)
+noop_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.0/restore-src/Makefile.am.pie	2006-02-14 06:51:23.000000000 -0500
+++ amanda-2.5.0/restore-src/Makefile.am	2006-04-07 15:35:48.000000000 -0400
@@ -32,6 +32,13 @@
                    ../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.0/tape-src/Makefile.am.pie	2006-02-14 06:51:24.000000000 -0500
+++ amanda-2.5.0/tape-src/Makefile.am	2006-04-07 15:34:46.000000000 -0400
@@ -8,6 +8,13 @@
 
 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 \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Nov 2005 18:24:15 -0000	1.10
+++ .cvsignore	10 Apr 2006 19:52:13 -0000	1.11
@@ -1 +1 @@
-amanda-2.4.5p1.tar.gz
+amanda-2.5.0.tar.gz


Index: amanda.spec
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- amanda.spec	11 Feb 2006 01:35:10 -0000	1.28
+++ amanda.spec	10 Apr 2006 19:52:13 -0000	1.29
@@ -1,6 +1,6 @@
 %define	_libexecdir	%{_libdir}/amanda
 %{!?defconfig:%define defconfig DailySet1}
-%{!?indexserver:%define indexserver localhost}
+%{!?indexserver:%define indexserver amandahost}
 %{!?tapeserver:%define tapeserver %{indexserver}}
 %{!?amanda_user:%define amanda_user amanda}
 %{!?amanda_group:%define amanda_group disk}
@@ -10,26 +10,26 @@
 
 Summary: A network-capable tape backup solution.
 Name: amanda
-Version: 2.4.5p1
-Release: 3.2
+Version: 2.5.0
+Release: 2
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
-#Source3: amanda.conf
 Source4: disklist
 Source5: amanda-xinetd
 Source6: amandaidx-xinetd
 Source7: amidxtape-xinetd
 Source8: amandahosts
 Patch0: amanda-2.4.2-bug18322.patch
-Patch1: amanda-2.4.4p2-pie.patch
+Patch1: amanda-2.5.0-pie.patch
+Patch2: amanda-2.5.0-overflow.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
 Prereq: fileutils grep initscripts
 BuildRequires: dump gnuplot cups samba-client tar grep fileutils
-BuildRequires: libtool automake autoconf gcc-c++ /usr/bin/Mail
-Requires: tar
+BuildRequires: libtool automake autoconf gcc-c++ readline-devel
+Requires: tar /usr/bin/Mail
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description 
@@ -49,7 +49,7 @@
 Summary: The client component of the AMANDA tape backup system.
 Group: Applications/System
 Prereq: fileutils grep /sbin/service xinetd
-Requires: amanda = %{version}
+Requires(pre): amanda = %{version}
 
 %description client
 The Amanda-client package should be installed on any machine that will
@@ -62,7 +62,7 @@
 Group: Applications/System
 Requires: gnuplot
 Prereq: fileutils grep /sbin/service xinetd
-Requires: amanda = %{version}
+Requires(pre): amanda = %{version}
 
 %description server
 The amanda-server package should be installed on the AMANDA server,
@@ -74,7 +74,7 @@
 %package devel
 Summary: Libraries and documentation of the AMANDA tape backup system.
 Group: Development/Libraries
-Requires: amanda = %{version}
+Requires(pre): amanda = %{version}
 
 %description devel
 The amanda-devel package should be installed on any machine that will
@@ -84,6 +84,7 @@
 %setup -q
 %patch0 -p1 -b .bug18322
 %patch1 -p1 -b .pie
+%patch2 -p1 -b .overflow
 libtoolize --copy --force
 aclocal
 automake
@@ -94,17 +95,20 @@
 export SED=sed
 
 %configure --enable-shared \
+	--disable-static \
 	--disable-dependency-tracking \
 	--with-index-server=%{indexserver} \
 	--with-tape-server=%{tapeserver} \
 	--with-config=%{defconfig} \
 	--with-gnutar-listdir=%{_localstatedir}/amanda/gnutar-lists \
 	--with-smbclient=%{_bindir}/smbclient \
+	--with-dumperdir=%{_libdir}/amanda/dumperdir \
 	--with-amandahosts \
 	--with-user=%amanda_user \
 	--with-group=%amanda_group \
 	--with-tmpdir=/var/log/amanda \
-	--with-gnutar=/bin/tar
+	--with-gnutar=/bin/tar \
+	--with-ssh-security
 	
 make %{?_smp_mflags}
 (cd common-src; make security)
@@ -126,25 +130,27 @@
 chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape
 mkdir -p $RPM_BUILD_ROOT/var/log/amanda
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/amanda
-install -m 660 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/amanda/.amandahosts
+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
 
-cp common-src/security ${RPM_BUILD_ROOT}%{_sbindir}
+#cp common-src/security ${RPM_BUILD_ROOT}%{_sbindir}
 pushd tape-src/.libs
 install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir}
 popd
 
 # cp ${RPM_SOURCE_DIR}/__README_QUICKSETUP__ docs/
+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
   cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample
-#  cp ${RPM_SOURCE_DIR}/amanda.conf .%{_sysconfdir}/amanda/%defconfig
-cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig}
+  cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
+  cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig}
   cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
   touch .%{_sysconfdir}/amandates
 
@@ -159,7 +165,9 @@
 
   chmod 755 .%{_libdir}/libam*
 popd
+cp examples/amanda.conf $RPM_BUILD_ROOT%{_sysconfdir}/amanda/%{defconfig}
 rm -rf $RPM_BUILD_ROOT/usr/share/amanda
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
@@ -192,11 +200,13 @@
 
 %files
 %defattr(-,root,root)
-%{_libdir}/libamanda*.so
-%{_libdir}/libamtape*.so
+%{_libdir}/libamanda-*.so
+%{_libdir}/libamtape-*.so
+%{_libdir}/libamserver-*.so
+%{_libdir}/librestore-*.so
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrestore
 %{_mandir}/man8/amrestore.8*
-%attr(660,%amanda_user,%amanda_group)  %config(noreplace) %{_localstatedir}/amanda/.amandahosts
+%attr(600,%amanda_user,%amanda_group)  %config(noreplace) %{_localstatedir}/amanda/.amandahosts
 
 %attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda
 %attr(-,%amanda_user,%amanda_group)	%dir %{_localstatedir}/amanda/
@@ -208,7 +218,6 @@
 %files server
 %defattr(-,root,root)
 %doc examples COPYRIGHT* NEWS README
-%{_libdir}/libamserver*.so
 %config(noreplace) /etc/xinetd.d/amandaidx
 %config(noreplace) /etc/xinetd.d/amidxtape
 %attr(-,%amanda_user,%amanda_group)    %dir %{_libexecdir}/
@@ -221,6 +230,11 @@
 %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
@@ -241,8 +255,10 @@
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amplot.g
 %attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amplot.gp
 
+%attr(-,%amanda_user,%amanda_group)    %{_sbindir}/amaespipe
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amadmin
 %attr(4750,root,%amanda_group)	%{_sbindir}/amcheck
+%attr(-,%amanda_user,%amanda_group)    %{_sbindir}/amcrypt
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amflush
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amgetconf
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amlabel
@@ -271,10 +287,12 @@
 %attr(-,%amanda_user,%amanda_group)	%config(noreplace) %{_sysconfdir}/amanda/%defconfig/disklist
 
 %{_mandir}/man8/amadmin.8*
+%{_mandir}/man8/amaespipe.8*
 %{_mandir}/man8/amanda.8*
 %{_mandir}/man8/amcheck.8*
 %{_mandir}/man8/amcheckdb.8*
 %{_mandir}/man8/amcleanup.8*
+%{_mandir}/man8/amcrypt.8*
 %{_mandir}/man8/amdd.8*
 %{_mandir}/man8/amdump.8*
 %{_mandir}/man8/amflush.8*
@@ -294,34 +312,56 @@
 
 %files client
 					%defattr(-,root,root)
-					%config /etc/xinetd.d/amanda
-					%{_libdir}/libamclient*.so
+					%config(noreplace) /etc/xinetd.d/amanda
+					%{_libdir}/libamclient-*.so
 %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(4750,root,%amanda_group)		%{_libexecdir}/amqde
 %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)    %{_sbindir}/amfetchdump
+                                       %{_mandir}/man8/amfetchdump.8*
 %attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrecover
 					%{_mandir}/man8/amrecover.8*
-%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/security
 %attr(-,%amanda_user,%amanda_group)	%{_localstatedir}/amanda/gnutar-lists/
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/libamanda.a
-%{_libdir}/libamtape.a
-%{_libdir}/libamclient.a
-%{_libdir}/libamserver.a
-%{_libdir}/*.la
+%{_libdir}/libamanda.so
+%{_libdir}/libamtape.so
+%{_libdir}/libamclient.so
+%{_libdir}/libamserver.so
+%{_libdir}/librestore.so
 
 %changelog
+* Fri Apr 7 2006 Jay Fenlason <fenlason redhat com> 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
+  <martineau zmanda com>
+
 * Fri Feb 10 2006 Jesse Keating <jkeating redhat com> - 2.4.5p1-3.2
 - bump again for double-long bug on ppc(64)
 


Index: amandahosts
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amandahosts,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amandahosts	9 Sep 2004 02:55:59 -0000	1.1
+++ amandahosts	10 Apr 2006 19:52:13 -0000	1.2
@@ -1,2 +1,2 @@
-localhost amanda
-localhost.localdomain amanda
+amandahost amanda
+amandahost.localdomain amanda


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Nov 2005 18:24:15 -0000	1.10
+++ sources	10 Apr 2006 19:52:13 -0000	1.11
@@ -1 +1 @@
-8fd967a6f63c4a91f0a38f56e2339ec8  amanda-2.4.5p1.tar.gz
+a720dafd60ff215dd97aa3271d7e0051  amanda-2.5.0.tar.gz


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]