OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsprogs?expand=0&rev=8

xfsprogs-mkfs.xfs-N.patch

@@ -0,0 +1,17 @@
+Index: mkfs/xfs_mkfs.c
+===================================================================
+RCS file: /cvs/xfs-cmds/xfsprogs/mkfs/xfs_mkfs.c,v
+retrieving revision 1.91
+retrieving revision 1.92
+diff -u -p -r1.91 -r1.92
+--- mkfs/xfs_mkfs.c	5 Jun 2008 04:28:00 -0000	1.91
++++ mkfs/xfs_mkfs.c	27 Aug 2008 04:13:09 -0000	1.92
+@@ -819,7 +819,7 @@ main(
+ 					xi.disfile = atoi(value);
+ 					if (xi.disfile < 0 || xi.disfile > 1)
+ 						illegal(value, "d file");
+-					if (xi.disfile)
++					if (xi.disfile && !Nflag)
+ 						xi.dcreat = 1;
+ 					break;
+ 				case D_NAME:

xfsprogs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  2 15:15:05 CEST 2008 - mmarek@suse.cz
+
+- mkfs.xfs: Don't destroy file with -N -d file options (bnc#409360)
+
 -------------------------------------------------------------------
 Tue Apr 29 12:26:30 CEST 2008 - mmarek@suse.cz
 

xfsprogs.spec

@@ -2,9 +2,16 @@
 # spec file for package xfsprogs (Version 2.9.8)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -14,7 +21,7 @@
 Name:           xfsprogs
 BuildRequires:  e2fsprogs-devel
 Version:        2.9.8
-Release:        1
+Release:        28
 # hint for ZYPP
 Supplements:    filesystem(xfs)
 AutoReqProv:    on
@@ -25,6 +32,7 @@ Summary:        Utilities for managing the XFS file system
 Source0:        xfsprogs_%{version}-1.tar.bz2
 Patch0:         xfsprogs-docdir.diff
 Patch1:         xfsprogs-ppc64.diff
+Patch2:         xfsprogs-mkfs.xfs-N.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -73,6 +81,7 @@ Authors:
 %setup -q
 %patch0
 %patch1
+%patch2
 
 %build
 %{suse_update_config -f}
@@ -134,6 +143,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man3/*
 
 %changelog
+* Tue Sep 02 2008 mmarek@suse.cz
+- mkfs.xfs: Don't destroy file with -N -d file options (bnc#409360)
 * Tue Apr 29 2008 mmarek@suse.cz
 - updated to version 2.9.8
   * Add support for sb_features2 in wrong location in mkfs.xfs,