1
0
forked from pool/xfsdump
OBS User unknown 2009-01-09 01:09:14 +00:00 committed by Git OBS Bridge
parent bf8ea9fcca
commit 293d5c684c
3 changed files with 46 additions and 4 deletions

26
xfsdump-librmt.patch Normal file
View File

@ -0,0 +1,26 @@
Index: xfsdump/librmt/rmtopen.c
===================================================================
RCS file: /cvs/xfs-cmds/xfsdump/librmt/rmtopen.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xfsdump/librmt/rmtopen.c 9 Nov 2005 05:04:17 -0000 1.13
+++ xfsdump/librmt/rmtopen.c 18 Nov 2008 02:25:38 -0000 1.14
@@ -171,7 +171,7 @@ static int _rmt_open (char *path, int of
}
rmt_f = popen(cmd, "r");
- if (rmt_f < 0) {
+ if (rmt_f == NULL) {
_rmt_msg(RMTWARN, _(
"rmtopen: failed to detect remote host type using \"%s\"\n"),
cmd);
@@ -183,7 +183,7 @@ static int _rmt_open (char *path, int of
char *c = fgets(uname, sizeof(uname), rmt_f);
pclose(rmt_f);
- if (c < 0) {
+ if (c == NULL) {
_rmt_msg(RMTWARN, _(
"rmtopen: failed to detect remote host type reading \"%s\"\n"),
cmd);

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 6 14:24:40 CET 2009 - mmarek@suse.cz
- fixed two pointer comparison errors in librmt (bnc#433393)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 20 10:09:09 CET 2008 - mmarek@suse.cz Thu Mar 20 10:09:09 CET 2008 - mmarek@suse.cz

View File

@ -1,10 +1,17 @@
# #
# spec file for package xfsdump (Version 2.2.48) # spec file for package xfsdump (Version 2.2.48)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 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/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
@ -14,7 +21,7 @@
Name: xfsdump Name: xfsdump
BuildRequires: e2fsprogs-devel libattr-devel ncurses-devel xfsprogs-devel BuildRequires: e2fsprogs-devel libattr-devel ncurses-devel xfsprogs-devel
Version: 2.2.48 Version: 2.2.48
Release: 1 Release: 43
AutoReqProv: on AutoReqProv: on
Group: System/Filesystems Group: System/Filesystems
License: GPL v2 or later License: GPL v2 or later
@ -22,6 +29,7 @@ Url: http://oss.sgi.com/projects/xfs/
Summary: Administrative Utilities for the XFS File System Summary: Administrative Utilities for the XFS File System
Source0: xfsdump_%version-1.tar.bz2 Source0: xfsdump_%version-1.tar.bz2
Patch0: xfsdump-docdir.diff Patch0: xfsdump-docdir.diff
Patch1: xfsdump-librmt.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -50,6 +58,7 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1 -p1
%build %build
%{suse_update_config -f} %{suse_update_config -f}
@ -80,6 +89,8 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/man/man8/* /usr/share/man/man8/*
%changelog %changelog
* Tue Jan 06 2009 mmarek@suse.cz
- fixed two pointer comparison errors in librmt (bnc#433393)
* Thu Mar 20 2008 mmarek@suse.cz * Thu Mar 20 2008 mmarek@suse.cz
- updated to 2.2.48 - updated to 2.2.48
* Prune dump sessions with 0 media files even when using -m. * Prune dump sessions with 0 media files even when using -m.