Accepting request 236985 from filesystems

1

OBS-URL: https://build.opensuse.org/request/show/236985
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsdump?expand=0&rev=25

xfsdump-3.0.1-fix-bufferoverflow.diff

@@ -1,21 +0,0 @@
-Index: xfsdump-3.0.1/common/path.c
-===================================================================
---- xfsdump-3.0.1.orig/common/path.c
-+++ xfsdump-3.0.1/common/path.c
-@@ -283,11 +283,15 @@ pa_gen( pa_t *pap )
- 
- 	sz = 0;
- 	for ( i = 0 ; i < pap->pa_cnt ; i++ ) {
- 		sz += strlen( pap->pa_array[ i ] ) + 1;
- 	}
--	sz++;
-+	sz++; /* '\0' */
-+	/* if pa_cnt == 0, then we need '/' + '\0' */
-+	if ( pap->pa_cnt <= 0 ) {
-+		sz++;
-+	}
- 
- 	retp = ( char * )malloc( sz );
- 
- 	if (  pap->pa_cnt <= 0 ) {
- 		ASSERT(  pap->pa_cnt == 0 );

xfsdump-3.0.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3a86b37e268779c940996a7aba93ed1f04ad942cbc1b8d75aae1e447aa762ad
-size 797719

xfsdump-3.1.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f02138a5d96e06c506ac8cb6e4fedeb0bf7d7cf8b9747f262d0735b885dbf8fa
+size 826922

xfsdump.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Jun  2 11:34:10 UTC 2014 - jack@suse.cz
+
+- Update to version 3.1.3:
+   - Unconditionally add checksums to various dump headers in
+     xfsdump.
+   - Verify dump header checksums if present in xfsrestore.
+   - Convert to using the POSIX signal API.
+   - Remove restriction of 8 options in dialogs.
+   - Various refactoring and internal cleanups to xfsdump and xfsrestore.
+   - Build system fixes, thanks to Ted Ts'o.
+   - Fix metadata restore on split files.
+   - Add a -D option to skip a recursive scan of the filesystem when dumping.
+   - Fix a 1 byte overflow with empty lists, thanks to Mike Frysinger.
+   - Enable multi-stream support on Linux using pthreads.
+   - Fix handling of Ctrl-D in prompts.
+   - Obsolete SGI_XFSDUMP_SKIP_FILE extended attribute for excluding
+     files from dump.
+   - Fix restoration of extended attributes on the root directory.
+   - Use the full 32-bit inode generation number instead of 12-bit
+     generation number.  Bump the dump format version to 3.
+   - Do not create parent directories for orphaned files during
+     list-only (-t option) restore.
+   - Save and restore 32 bit project ids correctly.
+   - Fix a segfault in xfsrestore when a path name is too long,
+     thanks to Nigel Tamplin.
+   - Fix a backward compatibility problem.  Dumps created with
+     version 3.1.2 where extended attributes are in use failed
+     to restore with v3.1.0 due to file header checksum errors.
+     Thanks to Fugazzi for reporting.
+   - Refactored release scripts to conform to using git archive.
+   - Changed the build process so that 'make deb' uses the same
+     process of creating a source tree as the release script.
+- Removed xfsdump-3.0.1-fix-bufferoverflow.diff, upstream fixed the problem
+  differently
+
 -------------------------------------------------------------------
 Sat Mar  9 19:09:21 UTC 2013 - schwab@suse.de
 

xfsdump.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xfsdump
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  libattr-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  xfsprogs-devel
-Version:        3.0.5
+Version:        3.1.3
 Release:        0
 Url:            http://oss.sgi.com/projects/xfs/
 Summary:        Administrative Utilities for the XFS File System
@@ -29,8 +29,7 @@ License:        GPL-2.0+
 Group:          System/Filesystems
 Source0:        xfsdump-%version.tar.gz
 Patch0:         xfsdump-docdir.diff
-Patch1:         xfsdump-3.0.1-fix-bufferoverflow.diff
+Patch1:         getdents.diff
-Patch2:         getdents.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description                                                         
@@ -60,7 +59,6 @@ Authors:
 %setup -q
 %patch0
 %patch1 -p1
-%patch2 -p1
 
 %build
 export DEBUG=-DNDEBUG
@@ -70,6 +68,7 @@ make %{?_smp_mflags}
 %install
 export DIST_ROOT="$RPM_BUILD_ROOT"
 make install
+%{find_lang} xfsdump
 # Remove the link created by the make file
 rm $RPM_BUILD_ROOT/%{_sbindir}/{xfsdump,xfsrestore}
 mv $RPM_BUILD_ROOT/sbin/{xfsdump,xfsrestore} $RPM_BUILD_ROOT/%{_sbindir}
@@ -78,7 +77,7 @@ ln -s %{_sbindir}/xfsdump $RPM_BUILD_ROOT/sbin
 ln -s %{_sbindir}/xfsrestore $RPM_BUILD_ROOT/sbin
 #EndUsrMerge 
 
-%files
+%files -f xfsdump.lang
 %defattr(-,root,root,755)
 %{_sbindir}/*
 #UsrMerge
@@ -86,5 +85,8 @@ ln -s %{_sbindir}/xfsrestore $RPM_BUILD_ROOT/sbin
 #EndUsrMerge 
 %doc %{_defaultdocdir}/%name
 %{_mandir}/man8/*
+%if 0%{?suse_version} > 1200
+%doc doc/COPYING
+%endif
 
 %changelog