[arch-commits] Commit in librsync/repos (8 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Mon Oct 21 15:00:15 UTC 2013
Date: Monday, October 21, 2013 @ 17:00:15
Author: foutrelis
Revision: 98947
archrelease: copy trunk to community-i686, community-x86_64
Added:
librsync/repos/community-i686/PKGBUILD
(from rev 98946, librsync/trunk/PKGBUILD)
librsync/repos/community-i686/lfs-overflow.patch
(from rev 98946, librsync/trunk/lfs-overflow.patch)
librsync/repos/community-x86_64/PKGBUILD
(from rev 98946, librsync/trunk/PKGBUILD)
librsync/repos/community-x86_64/lfs-overflow.patch
(from rev 98946, librsync/trunk/lfs-overflow.patch)
Deleted:
librsync/repos/community-i686/PKGBUILD
librsync/repos/community-i686/lfs-overflow.patch
librsync/repos/community-x86_64/PKGBUILD
librsync/repos/community-x86_64/lfs-overflow.patch
-------------------------------------+
/PKGBUILD | 68 +++++++++++++++++++++
/lfs-overflow.patch | 110 ++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 35 ----------
community-i686/lfs-overflow.patch | 55 -----------------
community-x86_64/PKGBUILD | 35 ----------
community-x86_64/lfs-overflow.patch | 55 -----------------
6 files changed, 178 insertions(+), 180 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-10-21 15:00:06 UTC (rev 98946)
+++ community-i686/PKGBUILD 2013-10-21 15:00:15 UTC (rev 98947)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
-# Contributor: Christoph 'delmonico' Neuroth <delmonico at gmx.net>
-
-pkgname=librsync
-pkgver=0.9.7
-pkgrel=6
-pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
-arch=('i686' 'x86_64')
-url="http://librsync.sourceforge.net/"
-license=('GPL')
-depends=('popt' 'zlib' 'bzip2')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/librsync/$pkgname-$pkgver.tar.gz
- lfs-overflow.patch)
-sha256sums=('6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6'
- 'bda94f0aa550498673a459326656798b9f327c8687fa924415cf7b08e8fd2f38')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Patch for large files (https://bugzilla.redhat.com/show_bug.cgi?id=207940)
- patch -Np1 -i "$srcdir/lfs-overflow.patch"
-
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: librsync/repos/community-i686/PKGBUILD (from rev 98946, librsync/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-10-21 15:00:15 UTC (rev 98947)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+# Contributor: Christoph 'delmonico' Neuroth <delmonico at gmx.net>
+
+pkgname=librsync
+pkgver=0.9.7
+pkgrel=7
+pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
+arch=('i686' 'x86_64')
+url="http://librsync.sourceforge.net/"
+license=('GPL')
+depends=('popt' 'zlib' 'bzip2')
+source=(http://downloads.sourceforge.net/sourceforge/librsync/$pkgname-$pkgver.tar.gz
+ lfs-overflow.patch)
+sha256sums=('6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6'
+ 'bda94f0aa550498673a459326656798b9f327c8687fa924415cf7b08e8fd2f38')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Patch for large files (https://bugzilla.redhat.com/show_bug.cgi?id=207940)
+ patch -Np1 -i "$srcdir/lfs-overflow.patch"
+
+ ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/lfs-overflow.patch
===================================================================
--- community-i686/lfs-overflow.patch 2013-10-21 15:00:06 UTC (rev 98946)
+++ community-i686/lfs-overflow.patch 2013-10-21 15:00:15 UTC (rev 98947)
@@ -1,55 +0,0 @@
-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;
Copied: librsync/repos/community-i686/lfs-overflow.patch (from rev 98946, librsync/trunk/lfs-overflow.patch)
===================================================================
--- community-i686/lfs-overflow.patch (rev 0)
+++ community-i686/lfs-overflow.patch 2013-10-21 15:00:15 UTC (rev 98947)
@@ -0,0 +1,55 @@
+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;
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-10-21 15:00:06 UTC (rev 98946)
+++ community-x86_64/PKGBUILD 2013-10-21 15:00:15 UTC (rev 98947)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
-# Contributor: Christoph 'delmonico' Neuroth <delmonico at gmx.net>
-
-pkgname=librsync
-pkgver=0.9.7
-pkgrel=6
-pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
-arch=('i686' 'x86_64')
-url="http://librsync.sourceforge.net/"
-license=('GPL')
-depends=('popt' 'zlib' 'bzip2')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/librsync/$pkgname-$pkgver.tar.gz
- lfs-overflow.patch)
-sha256sums=('6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6'
- 'bda94f0aa550498673a459326656798b9f327c8687fa924415cf7b08e8fd2f38')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Patch for large files (https://bugzilla.redhat.com/show_bug.cgi?id=207940)
- patch -Np1 -i "$srcdir/lfs-overflow.patch"
-
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: librsync/repos/community-x86_64/PKGBUILD (from rev 98946, librsync/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-10-21 15:00:15 UTC (rev 98947)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+# Contributor: Christoph 'delmonico' Neuroth <delmonico at gmx.net>
+
+pkgname=librsync
+pkgver=0.9.7
+pkgrel=7
+pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
+arch=('i686' 'x86_64')
+url="http://librsync.sourceforge.net/"
+license=('GPL')
+depends=('popt' 'zlib' 'bzip2')
+source=(http://downloads.sourceforge.net/sourceforge/librsync/$pkgname-$pkgver.tar.gz
+ lfs-overflow.patch)
+sha256sums=('6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6'
+ 'bda94f0aa550498673a459326656798b9f327c8687fa924415cf7b08e8fd2f38')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Patch for large files (https://bugzilla.redhat.com/show_bug.cgi?id=207940)
+ patch -Np1 -i "$srcdir/lfs-overflow.patch"
+
+ ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/lfs-overflow.patch
===================================================================
--- community-x86_64/lfs-overflow.patch 2013-10-21 15:00:06 UTC (rev 98946)
+++ community-x86_64/lfs-overflow.patch 2013-10-21 15:00:15 UTC (rev 98947)
@@ -1,55 +0,0 @@
-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;
Copied: librsync/repos/community-x86_64/lfs-overflow.patch (from rev 98946, librsync/trunk/lfs-overflow.patch)
===================================================================
--- community-x86_64/lfs-overflow.patch (rev 0)
+++ community-x86_64/lfs-overflow.patch 2013-10-21 15:00:15 UTC (rev 98947)
@@ -0,0 +1,55 @@
+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;
More information about the arch-commits
mailing list