Include fix for streaming plugin in 1.1.9.
This commit is contained in:
		
							parent
							
								
									f8319421f7
								
							
						
					
					
						commit
						5101c502a7
					
				| @ -0,0 +1,25 @@ | |||||||
|  | From b40717749648b972585cba04b69dc398e1e8e9fd Mon Sep 17 00:00:00 2001 | ||||||
|  | From: "Richard W.M. Jones" <rjones@redhat.com> | ||||||
|  | Date: Tue, 14 Oct 2014 16:13:36 +0200 | ||||||
|  | Subject: [PATCH] streaming: Update the buf pointer when doing partial writes. | ||||||
|  | 
 | ||||||
|  | This fixes commit 72070d1ba15a45ce06519074846a612b97a4e54f. | ||||||
|  | ---
 | ||||||
|  |  plugins/streaming/streaming.c | 1 + | ||||||
|  |  1 file changed, 1 insertion(+) | ||||||
|  | 
 | ||||||
|  | diff --git a/plugins/streaming/streaming.c b/plugins/streaming/streaming.c
 | ||||||
|  | index 619c452..2381e60 100644
 | ||||||
|  | --- a/plugins/streaming/streaming.c
 | ||||||
|  | +++ b/plugins/streaming/streaming.c
 | ||||||
|  | @@ -202,6 +202,7 @@ streaming_pwrite (void *handle, const void *buf,
 | ||||||
|  |        errorstate = 1; | ||||||
|  |        return -1; | ||||||
|  |      } | ||||||
|  | +    buf += r;
 | ||||||
|  |      highestwrite += r; | ||||||
|  |      count -= r; | ||||||
|  |    } | ||||||
|  | -- 
 | ||||||
|  | 2.0.4 | ||||||
|  | 
 | ||||||
| @ -6,13 +6,15 @@ | |||||||
| 
 | 
 | ||||||
| Name:           nbdkit | Name:           nbdkit | ||||||
| Version:        1.1.9 | Version:        1.1.9 | ||||||
| Release:        1%{?dist} | Release:        2%{?dist} | ||||||
| Summary:        NBD server | Summary:        NBD server | ||||||
| 
 | 
 | ||||||
| License:        BSD | License:        BSD | ||||||
| URL:            https://github.com/libguestfs/nbdkit | URL:            https://github.com/libguestfs/nbdkit | ||||||
| Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz | Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz | ||||||
| 
 | 
 | ||||||
|  | Patch1:         0001-streaming-Update-the-buf-pointer-when-doing-partial-.patch | ||||||
|  | 
 | ||||||
| BuildRequires:  /usr/bin/pod2man | BuildRequires:  /usr/bin/pod2man | ||||||
| %if 0%{?have_libguestfs} | %if 0%{?have_libguestfs} | ||||||
| BuildRequires:  libguestfs-devel | BuildRequires:  libguestfs-devel | ||||||
| @ -178,6 +180,8 @@ plugins for %{name}. | |||||||
| %prep | %prep | ||||||
| %setup -q | %setup -q | ||||||
| 
 | 
 | ||||||
|  | %patch1 -p1 | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| %build | %build | ||||||
| # Force immediate binding for hardened build for plugins. | # Force immediate binding for hardened build for plugins. | ||||||
| @ -290,9 +294,10 @@ make check | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
| * Tue Oct 14 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1.9-1 | * Tue Oct 14 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1.9-2 | ||||||
| - New upstream version 1.1.9. | - New upstream version 1.1.9. | ||||||
| - Add the streaming plugin. | - Add the streaming plugin. | ||||||
|  | - Include fix for streaming plugin in 1.1.9. | ||||||
| 
 | 
 | ||||||
| * Wed Sep 10 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1.8-4 | * Wed Sep 10 2014 Richard W.M. Jones <rjones@redhat.com> - 1.1.8-4 | ||||||
| - Rebuild for updated Perl in Rawhide. | - Rebuild for updated Perl in Rawhide. | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user