diff --git a/amanda-2.5.0p2-dump_size.patch b/amanda-2.5.0p2-dump_size.patch new file mode 100644 index 0000000..dda7b86 --- /dev/null +++ b/amanda-2.5.0p2-dump_size.patch @@ -0,0 +1,13 @@ +--- 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 */ diff --git a/amanda-xinetd b/amanda-xinetd index 1f41cb5..8b1b5f3 100644 --- a/amanda-xinetd +++ b/amanda-xinetd @@ -7,6 +7,8 @@ service amanda { 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 diff --git a/amanda.spec b/amanda.spec index fa710df..886b306 100644 --- a/amanda.spec +++ b/amanda.spec @@ -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 @@ Source8: amandahosts 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 @@ be used to develop amanda applications. %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 @@ useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ %{_libdir}/libamandad.so %changelog +* Mon Jun 9 2007 Radek Brich 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 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