Accepting request 33190 from filesystems

checked in (request 33190)

OBS-URL: https://build.opensuse.org/request/show/33190
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsdump?expand=0&rev=6

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.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-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
 

xfsdump.spec

@@ -29,7 +29,6 @@ Url:            http://oss.sgi.com/projects/xfs/
 Summary:        Administrative Utilities for the XFS File System
 Source0:        xfsdump-%version.tar.bz2
 Patch0:         xfsdump-docdir.diff
-Patch1:         xfsdump-3.0.1-fix-bufferoverflow.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description                                                         
@@ -58,7 +57,6 @@ Authors:
 %prep
 %setup -q
 %patch0
-%patch1 -p1
 
 %build
 export CFLAGS=$RPM_OPT_FLAGS