rpms/amanda/F-7 amanda-2.5.0p2-dump_size.patch, NONE, 1.1 amanda-xinetd, 1.4, 1.5 amanda.spec, 1.36, 1.37

[Radek Brich (rbrich)]

Author: rbrich

Update of /cvs/extras/rpms/amanda/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29230

Modified Files:
	amanda-xinetd amanda.spec 
Added Files:
	amanda-2.5.0p2-dump_size.patch 
Log Message:
fix #244916, #247242

amanda-2.5.0p2-dump_size.patch:

--- NEW FILE amanda-2.5.0p2-dump_size.patch ---
--- amanda-2.5.0p2/client-src/#sendbackup-dump.c~	2006-09-25 13:58:37.000000000 -0400
+++ amanda-2.5.0p2/client-src/sendbackup-dump.c	2006-09-25 13:58:37.000000000 -0400
@@ -52,6 +52,10 @@
 	     512),
   AM_SIZE_RE("DUMP: [0-9][0-9]* blocks \\([0-9][0-9]*\\.[0-9][0-9]*MB\\) on [0-9][0-9]* volume",
 	     512),
+
+  /* DUMP: 19040 blocks (18.59MB) */
+  AM_SIZE_RE("DUMP: [0-9][0-9]* blocks \\([0-9][0-9]*.[0-9][0-9]*MB\\)", 1024),
+
   AM_SIZE_RE("DUMP: [0-9][0-9]* blocks", 512),
   AM_SIZE_RE("DUMP: [0-9][0-9]* bytes were dumped", 1),
   /* OSF's vdump */


Index: amanda-xinetd
===================================================================
RCS file: /cvs/extras/rpms/amanda/F-7/amanda-xinetd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- amanda-xinetd	20 Feb 2007 20:12:52 -0000	1.4
+++ amanda-xinetd	9 Jul 2007 10:04:30 -0000	1.5
@@ -7,6 +7,8 @@
 {
 	socket_type		= dgram
 	protocol		= udp
+# force IPv4 socket since IPv6 is not supported (in amanda-2.5.1p3)
+	flags			= IPv4
 	wait			= yes
 	user			= amanda
 	group			= disk


Index: amanda.spec
===================================================================
RCS file: /cvs/extras/rpms/amanda/F-7/amanda.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- amanda.spec	20 Feb 2007 20:12:52 -0000	1.36
+++ amanda.spec	9 Jul 2007 10:04:30 -0000	1.37
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution.
 Name: amanda
 Version: 2.5.1p3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -20,6 +20,7 @@
 Patch0: amanda-2.4.2-bug18322.patch
 Patch1: amanda-2.5.0-pie.patch
 Patch2: amanda-2.5.1p1-rsh.patch
+Patch3: amanda-2.5.0p2-dump_size.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
@@ -83,6 +84,7 @@
 %patch0 -p1 -b .bug18322
 %patch1 -p1 -b .pie
 %patch2 -p1 -b .rsh
+%patch3 -p1 -b .dump_size
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE"
@@ -331,6 +333,11 @@
 %{_libdir}/libamandad.so
 
 %changelog
+* Mon Jun 9 2007 Radek Brich <rbrich at redhat.com> 2.5.1p3-2
+- add "flags = IPv4" to amanda-xinetd to fix #244916
+  (update to xinetd causes amanda client to timeout/fail)
+- fix #247242 (Dump output size determined incorrectly)
+
 * Mon Feb 19 2007 Jay Fenlason <fenlason at redhat.com> 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