rpms/librsync/devel librsync-0.9.7-lfs_overflow.patch, NONE, 1.1 librsync.spec, 1.11, 1.12

Robert Scheck (robert) fedora-extras-commits at redhat.com
Mon Sep 25 19:01:12 UTC 2006


Author: robert

Update of /cvs/extras/rpms/librsync/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29232

Modified Files:
	librsync.spec 
Added Files:
	librsync-0.9.7-lfs_overflow.patch 
Log Message:
Added an upstream patch to solve a lfs overflow (#207940)


librsync-0.9.7-lfs_overflow.patch:

--- NEW FILE librsync-0.9.7-lfs_overflow.patch ---
Files over 4 Gig in size encountered an error resulting in an unsuccessful copy as
per (upstream) Bug Request ID: 1110812.

The assignment 'len = job->basis_len' sometimes overflows. Made changes so that
assignment is done only when appropriate.

rs_mdfour variables B and C were observed to overflow their 'int' definition.
This has been changed to 'unsigned int', which is now consistent with like coding
in the openssl package.

--- librsync-0.9.7/mdfour.h			2004-02-08 00:17:57.000000000 +0100
+++ librsync-0.9.7/mdfour.h.lfs_overflow	2006-03-10 11:44:10.000000000 +0100
@@ -1,7 +1,7 @@
 /*= -*- c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *
  * librsync -- the library for network deltas
- * $Id: mdfour.h,v 1.7 2003/10/17 16:15:21 abo Exp $
+ * $Id: mdfour.h,v 1.8 2006/03/10 10:44:10 abo Exp $
  * 
  * Copyright (C) 2000, 2001 by Martin Pool <mbp at samba.org>
  * Copyright (C) 2002, 2003 by Donovan Baarda <abo at minkirri.apana.org.au> 
@@ -24,7 +24,7 @@
 #include "types.h"
 
 struct rs_mdfour {
-    int                 A, B, C, D;
+    unsigned int        A, B, C, D;
 #if HAVE_UINT64
     uint64_t            totalN;
 #else
--- librsync-0.9.7/patch.c			2004-09-17 23:35:50.000000000 +0200
+++ librsync-0.9.7/patch.c.lfs_overflow		2006-03-10 11:44:10.000000000 +0100
@@ -1,7 +1,7 @@
 /*= -*- c-basic-offset: 4; indent-tabs-mode: nil; -*-
  *
  * librsync -- the library for network deltas
- * $Id: patch.c,v 1.30 2004/09/10 02:48:58 mbp Exp $
+ * $Id: patch.c,v 1.31 2006/03/10 10:44:10 abo Exp $
  * 
  * Copyright (C) 2000, 2001 by Martin Pool <mbp at samba.org>
  * 
@@ -214,12 +214,9 @@
     void            *buf, *ptr;
     rs_buffers_t    *buffs = job->stream;
 
-    len = job->basis_len;
-    
     /* copy only as much as will fit in the output buffer, so that we
      * don't have to block or store the input. */
-    if (len > buffs->avail_out)
-        len = buffs->avail_out;
+    len = (buffs->avail_out < job->basis_len) ? buffs->avail_out : job->basis_len;
 
     if (!len)
         return RS_BLOCKED;


Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/devel/librsync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- librsync.spec	20 Sep 2006 19:06:27 -0000	1.11
+++ librsync.spec	25 Sep 2006 19:01:12 -0000	1.12
@@ -1,11 +1,11 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        5%{?dist}
-
+Release:        6%{?dist}
 License:        LGPL
 Group:          System Environment/Libraries
 Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch:          librsync-0.9.7-lfs_overflow.patch
 URL:            http://librsync.sf.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel, bzip2-devel, popt
@@ -24,9 +24,9 @@
 and incompatible with rsync 2.4.6.
 
 %package devel
-Summary: Headers and development libraries for librsync
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary:        Headers and development libraries for librsync
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 librsync implements the "rsync" algorithm, which allows remote
@@ -45,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .lfs_overflow
 
 %build
 autoreconf -f
@@ -79,6 +80,9 @@
 %exclude %{_libdir}/librsync.la
 
 %changelog
+* Mon Sep 25 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-6
+- added an upstream patch to solve a lfs overflow (#207940)
+
 * Wed Sep 20 2006 Robert Scheck <robert at fedoraproject.org> 0.9.7-5
 - some spec file cleanup, added %%{?dist} and rebuild
 




More information about the fedora-extras-commits mailing list