From 673086366a81fceed6e0c92145e1f25a50028a27fce49b352d0af5d2a730d6f4 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 20 Jun 2011 13:12:11 +0000 Subject: [PATCH] Accepting request 74186 from home:michal-m:branches:filesystems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - updated to 3.0.5 - Release tags will now be digitally signed - Quota files will now be dumped, regardless of the maxsize setting - The new "-s sessid" flag allows inventory sessions to be pruned by their session ID. - Fixed a bug in handling long dump filenames, and dropped (undocumented) support for encoding certain parameters within the dump filename - NODECHK is now off by default, meaning xfsrestore will now support 16 times more directory entries (4 billion) - nrh_t is now 64 bits wide, allowing xfsrestore to support dumps with up to 4 billion directory entries - nix_t is no longer useful, and has been eliminated - Memory use in xfsrestore is better managed now. Segments of nodes are now power-of-2 sized, and allocated nodes are no longer needlessly zeroed and linked into the free list. - Pathname resolution in xfsrestore has a number of performance improvements - Better checking has been implemented for compatibility when resuming a cumulative restore - Build system output has been cleaned up considerably - Dead "namreg" code has been removed - Build dependencies are now determined automatically - Other miscellaneous build system improvements, as well bug fixes thanks to Mike Frysinger and Arkadiusz Miśkiewicz. - Improve xfsinvutil man page and argument processing. - Fix timestamp handling on 64-bit architectures in xfsinvutil. - Various build system improvements. OBS-URL: https://build.opensuse.org/request/show/74186 OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsdump?expand=0&rev=7 --- ready | 0 xfsdump-3.0.1-fix-bufferoverflow.diff | 21 +++++++++++++++ xfsdump-3.0.1.tar.bz2 | 3 --- xfsdump-3.0.5.tar.gz | 3 +++ xfsdump-docdir.diff | 10 ++++--- xfsdump.changes | 38 +++++++++++++++++++++++++++ xfsdump.spec | 13 ++++----- 7 files changed, 76 insertions(+), 12 deletions(-) delete mode 100644 ready create mode 100644 xfsdump-3.0.1-fix-bufferoverflow.diff delete mode 100644 xfsdump-3.0.1.tar.bz2 create mode 100644 xfsdump-3.0.5.tar.gz diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/xfsdump-3.0.1-fix-bufferoverflow.diff b/xfsdump-3.0.1-fix-bufferoverflow.diff new file mode 100644 index 0000000..52355ee --- /dev/null +++ b/xfsdump-3.0.1-fix-bufferoverflow.diff @@ -0,0 +1,21 @@ +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 ); diff --git a/xfsdump-3.0.1.tar.bz2 b/xfsdump-3.0.1.tar.bz2 deleted file mode 100644 index 9d1d808..0000000 --- a/xfsdump-3.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c30dcfa827d0b3a96e6bb90d2edaab7300abb33da420ca1cb56de8a66f2140e -size 679882 diff --git a/xfsdump-3.0.5.tar.gz b/xfsdump-3.0.5.tar.gz new file mode 100644 index 0000000..311f79c --- /dev/null +++ b/xfsdump-3.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3a86b37e268779c940996a7aba93ed1f04ad942cbc1b8d75aae1e447aa762ad +size 797719 diff --git a/xfsdump-docdir.diff b/xfsdump-docdir.diff index a543c08..35d1ead 100644 --- a/xfsdump-docdir.diff +++ b/xfsdump-docdir.diff @@ -1,7 +1,11 @@ ---- include/builddefs.in +--- + include/builddefs.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- include/builddefs.in.orig +++ include/builddefs.in -@@ -36,7 +36,7 @@ - PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ +@@ -37,7 +37,7 @@ PKG_ROOT_SBIN_DIR = @root_sbindir@ + PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@ PKG_INC_DIR = @includedir@ PKG_MAN_DIR = @mandir@ -PKG_DOC_DIR = @datadir@/doc/@pkg_name@ diff --git a/xfsdump.changes b/xfsdump.changes index 9cf38e9..c1e26a3 100644 --- a/xfsdump.changes +++ b/xfsdump.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Mon Jun 20 11:28:11 UTC 2011 - mmarek@novell.com + +- updated to 3.0.5 + - Release tags will now be digitally signed + - Quota files will now be dumped, regardless of the maxsize + setting + - The new "-s sessid" flag allows inventory sessions to be pruned + by their session ID. + - Fixed a bug in handling long dump filenames, and dropped + (undocumented) support for encoding certain parameters within + the dump filename + - NODECHK is now off by default, meaning xfsrestore will now + support 16 times more directory entries (4 billion) + - nrh_t is now 64 bits wide, allowing xfsrestore to support dumps + with up to 4 billion directory entries + - nix_t is no longer useful, and has been eliminated + - Memory use in xfsrestore is better managed now. Segments of + nodes are now power-of-2 sized, and allocated nodes are no + longer needlessly zeroed and linked into the free list. + - Pathname resolution in xfsrestore has a number of performance + improvements + - Better checking has been implemented for compatibility when + resuming a cumulative restore + - Build system output has been cleaned up considerably + - Dead "namreg" code has been removed + - Build dependencies are now determined automatically + - Other miscellaneous build system improvements, as well bug + fixes thanks to Mike Frysinger and Arkadiusz Miśkiewicz. + - Improve xfsinvutil man page and argument processing. + - Fix timestamp handling on 64-bit architectures in xfsinvutil. + - Various build system improvements. + +------------------------------------------------------------------- +Mon Feb 22 23:28:43 CET 2010 - seife@opensuse.org + +- fix buffer overflow (detected by gcc-4.5) + ------------------------------------------------------------------- Tue Jun 23 12:13:33 CEST 2009 - mmarek@suse.cz diff --git a/xfsdump.spec b/xfsdump.spec index d31450b..8da8635 100644 --- a/xfsdump.spec +++ b/xfsdump.spec @@ -1,7 +1,7 @@ # # spec file for package xfsdump (Version 3.0.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,15 +20,16 @@ Name: xfsdump BuildRequires: e2fsprogs-devel libattr-devel ncurses-devel xfsprogs-devel -Version: 3.0.1 -Release: 1 +Version: 3.0.5 +Release: 2 AutoReqProv: on Group: System/Filesystems -License: GPL v2 or later +License: GPLv2+ Url: http://oss.sgi.com/projects/xfs/ Summary: Administrative Utilities for the XFS File System -Source0: xfsdump-%version.tar.bz2 +Source0: xfsdump-%version.tar.gz Patch0: xfsdump-docdir.diff +Patch1: xfsdump-3.0.1-fix-bufferoverflow.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ Authors: %prep %setup -q %patch0 +%patch1 -p1 %build export CFLAGS=$RPM_OPT_FLAGS @@ -79,7 +81,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,755) /sbin/* -/usr/sbin/* %doc %_defaultdocdir/%name /usr/share/man/man8/*