rpms/fsarchiver/devel fsarchiver-0.6.2-fix-splitting.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 fsarchiver.spec, 1.20, 1.21 sources, 1.13, 1.14
drago01
drago01 at fedoraproject.org
Tue Dec 22 19:33:10 UTC 2009
Author: drago01
Update of /cvs/pkgs/rpms/fsarchiver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4508
Modified Files:
.cvsignore fsarchiver.spec sources
Added Files:
fsarchiver-0.6.2-fix-splitting.patch
Log Message:
0.6.2
fsarchiver-0.6.2-fix-splitting.patch:
fsarchiver.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE fsarchiver-0.6.2-fix-splitting.patch ---
diff -urN fsarchiver-0.6.2-orig/src/fsarchiver.c fsarchiver-0.6.2-patch/src/fsarchiver.c
--- fsarchiver-0.6.2-orig/src/fsarchiver.c 2009-12-07 20:20:16.000000000 +0000
+++ fsarchiver-0.6.2-patch/src/fsarchiver.c 2009-12-21 15:04:41.000000000 +0000
@@ -199,6 +199,7 @@
sigset_t mask_set;
char *probemode;
bool probedetailed=0;
+ char tempbuf[512];
char *command=NULL;
char *archive=NULL;
char *partition[32];
@@ -266,13 +267,18 @@
}
break;
case 's': // split archive into several volumes
- g_options.splitsize=atol(optarg)*1024*1024;
+ g_options.splitsize=((u64)atoll(optarg))*((u64)1024LL*1024LL);
if (g_options.splitsize==0)
{
errprintf("argument of option -s is invalid (%s). It must be a valid integer\n", optarg);
usage(progname, false);
return 1;
}
+ else // show the calculated size since it was probably incorrect before due to an integer overflow
+ {
+ msgprintf(MSG_FORCE, "Archives will be split into volumes of the following size:\n%lld bytes (%s)",
+ (long long)g_options.splitsize, format_size(g_options.splitsize, tempbuf, sizeof(tempbuf), 'h'));
+ }
break;
case 'z': // compression level
g_options.fsacomplevel=atoi(optarg);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore 10 Oct 2009 10:09:23 -0000 1.13
+++ .cvsignore 22 Dec 2009 19:33:10 -0000 1.14
@@ -1 +1 @@
-fsarchiver-0.6.1.tar.gz
+fsarchiver-0.6.2.tar.gz
Index: fsarchiver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/fsarchiver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- fsarchiver.spec 10 Oct 2009 10:09:23 -0000 1.20
+++ fsarchiver.spec 22 Dec 2009 19:33:10 -0000 1.21
@@ -1,5 +1,5 @@
Name: fsarchiver
-Version: 0.6.1
+Version: 0.6.2
Release: 1%{?dist}
Summary: Safe and flexible file-system backup/deployment tool
@@ -9,6 +9,8 @@ URL: http://www.fsarchiver.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: fsarchiver-0.6.2-fix-splitting.patch
+
BuildRequires: e2fsprogs-devel => 1.41.4
BuildRequires: libuuid-devel
BuildRequires: libblkid-devel
@@ -31,6 +33,7 @@ is corrupt, you just loose the current f
%prep
%setup -q
+%patch1 -p1 -b .split
%build
%configure
@@ -53,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING README THANKS NEWS
%changelog
+* Tue Dec 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-1
+- Update to 0.6.2
+- Apply fix as requested by upstream
+
* Sat Oct 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.1-1
- Update to 0.6.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fsarchiver/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources 10 Oct 2009 10:09:23 -0000 1.13
+++ sources 22 Dec 2009 19:33:10 -0000 1.14
@@ -1 +1 @@
-8d09cb2ee729d65005458c6d759e3cc4 fsarchiver-0.6.1.tar.gz
+148a13ff7ecc4c65b5517184564ac2fe fsarchiver-0.6.2.tar.gz
More information about the fedora-extras-commits
mailing list