This commit is contained in:
parent
d8e6713825
commit
e593b1c902
15
fuse-compat-abort-fix.diff
Normal file
15
fuse-compat-abort-fix.diff
Normal file
@ -0,0 +1,15 @@
|
||||
--- lib/fuse.c-dist 2007-01-18 16:32:18.000000000 +0100
|
||||
+++ lib/fuse.c 2007-01-18 16:36:27.000000000 +0100
|
||||
@@ -2948,9 +2948,10 @@ static struct fuse *fuse_new_common_comp
|
||||
struct fuse *f;
|
||||
struct fuse_args args = FUSE_ARGS_INIT(0, NULL);
|
||||
|
||||
+ if (fuse_opt_add_arg(&args, "") == -1)
|
||||
+ return NULL;
|
||||
if (opts &&
|
||||
- (fuse_opt_add_arg(&args, "") == -1 ||
|
||||
- fuse_opt_add_arg(&args, "-o") == -1 ||
|
||||
+ (fuse_opt_add_arg(&args, "-o") == -1 ||
|
||||
fuse_opt_add_arg(&args, opts) == -1)) {
|
||||
fuse_opt_free_args(&args);
|
||||
return NULL;
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 18 16:39:47 CET 2007 - tiwai@suse.de
|
||||
|
||||
- fix compat API (#233870)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 16:39:13 CET 2006 - tiwai@suse.de
|
||||
|
||||
|
10
fuse.spec
10
fuse.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fuse (Version 2.6.1)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2007 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.
|
||||
#
|
||||
@ -13,11 +13,12 @@
|
||||
Name: fuse
|
||||
Summary: Userspace File System
|
||||
Version: 2.6.1
|
||||
Release: 1
|
||||
License: GNU General Public License (GPL), Other License(s), see package
|
||||
Release: 4
|
||||
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
||||
Group: System/Filesystems
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Patch: fuse-install-fix.diff
|
||||
Patch1: fuse-compat-abort-fix.diff
|
||||
URL: http://fuse.sf.net
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: permissions
|
||||
@ -54,6 +55,7 @@ Authors:
|
||||
%prep
|
||||
%setup -q
|
||||
%patch
|
||||
%patch1
|
||||
%{?suse_update_config:%{suse_update_config -f}}
|
||||
|
||||
%build
|
||||
@ -103,6 +105,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%changelog -n fuse
|
||||
* Thu Jan 18 2007 - tiwai@suse.de
|
||||
- fix compat API (#233870)
|
||||
* Tue Dec 19 2006 - tiwai@suse.de
|
||||
- updated to version 2.6.1:
|
||||
* improved fusermout help texts
|
||||
|
Loading…
Reference in New Issue
Block a user