[arch-commits] CVS update of extra/network/rsync (3 files)
Eric Belanger
eric at archlinux.org
Mon Mar 3 02:47:17 UTC 2008
Date: Sunday, March 2, 2008 @ 21:47:17
Author: eric
Path: /home/cvs-extra/extra/network/rsync
Added: ChangeLog (1.1)
Modified: PKGBUILD (1.35 -> 1.36)
Removed: rsync-2.6.9-fname-obo.diff (1.1)
upgpkg: rsync 3.0.0-1
upstream update, updated license, added ChangeLog
----------------------------+
ChangeLog | 4 ++
PKGBUILD | 16 +++++------
rsync-2.6.9-fname-obo.diff | 60 -------------------------------------------
3 files changed, 11 insertions(+), 69 deletions(-)
Index: extra/network/rsync/ChangeLog
diff -u /dev/null extra/network/rsync/ChangeLog:1.1
--- /dev/null Sun Mar 2 21:47:17 2008
+++ extra/network/rsync/ChangeLog Sun Mar 2 21:47:17 2008
@@ -0,0 +1,4 @@
+2008-03-01 Eric Belanger <eric at archlinux.org>
+
+ * Upstream update 3.0.0
+ * Updated license
Index: extra/network/rsync/PKGBUILD
diff -u extra/network/rsync/PKGBUILD:1.35 extra/network/rsync/PKGBUILD:1.36
--- extra/network/rsync/PKGBUILD:1.35 Sat Dec 8 21:32:04 2007
+++ extra/network/rsync/PKGBUILD Sun Mar 2 21:47:17 2008
@@ -1,34 +1,32 @@
-# $Id: PKGBUILD,v 1.35 2007/12/09 02:32:04 eric Exp $
+# $Id: PKGBUILD,v 1.36 2008/03/03 02:47:17 eric Exp $
# Maintainer: Eric Belanger <eric at archlinux.org>
# Contributor: Judd Vinet <jvinet at zeroflux.org>
pkgname=rsync
-pkgver=2.6.9
-pkgrel=4
+pkgver=3.0.0
+pkgrel=1
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64')
url="http://samba.anu.edu.au/rsync/"
-license=('GPL')
+license=('GPL3')
depends=('acl')
backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \
rsyncd.conf rsyncd rsync.xinetd)
-md5sums=('996d8d8831dbca17910094e56dcb5942' '4395c0591638349b1a7aeaaa4da1f03a'\
+md5sums=('2122d460b4119749c6e5993938a9b501' '4395c0591638349b1a7aeaaa4da1f03a'\
'9de4d03d49f4b5c73ffd67d452716a49' 'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('341618e230ea2e0e551d0ccf06f840d4f824c843'
+sha1sums=('8c5582ba2977cd4bf96add95226c64b949931eec'
'48be09294134dfed888818872fe552a59c29147a'
'ebec275bbd0c11692c91dc59368349601bd9eaf4'
'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
build() {
cd $startdir/src/$pkgname-$pkgver
- patch -p1 -i patches/acls.diff || return 1
- patch -p1 -i patches/xattrs.diff || return 1
./prepare-source || return 1
./configure --prefix=/usr --with-included-popt \
--enable-acl-support --enable-xattr-support
make || return 1
- make prefix=$startdir/pkg/usr install
+ make DESTDIR=$startdir/pkg install
install -D -m 755 ../rsyncd $startdir/pkg/etc/rc.d/rsyncd
install -D -m 644 ../rsyncd.conf $startdir/pkg/etc/rsyncd.conf
install -D -m 644 ../rsync.xinetd $startdir/pkg/etc/xinetd.d/rsync
Index: extra/network/rsync/rsync-2.6.9-fname-obo.diff
diff -u extra/network/rsync/rsync-2.6.9-fname-obo.diff:1.1 extra/network/rsync/rsync-2.6.9-fname-obo.diff:removed
--- extra/network/rsync/rsync-2.6.9-fname-obo.diff:1.1 Sun Sep 30 07:01:42 2007
+++ extra/network/rsync/rsync-2.6.9-fname-obo.diff Sun Mar 2 21:47:17 2008
@@ -1,60 +0,0 @@
---- rsync-2.6.9.orig/sender.c 2006-09-20 03:53:32.000000000 +0200
-+++ rsync-2.6.9/sender.c 2007-07-25 15:33:05.000000000 +0200
-@@ -123,6 +123,7 @@
- char fname[MAXPATHLEN];
- struct file_struct *file;
- unsigned int offset;
-+ size_t l = 0;
-
- if (ndx < 0 || ndx >= the_file_list->count)
- return;
-@@ -133,6 +134,20 @@
- file->dir.root, "/", NULL);
- } else
- offset = 0;
-+
-+ l = offset + 1;
-+ if (file) {
-+ if (file->dirname)
-+ l += strlen(file->dirname);
-+ if (file->basename)
-+ l += strlen(file->basename);
-+ }
-+
-+ if (l >= sizeof(fname)) {
-+ rprintf(FERROR, "Overlong pathname\n");
-+ exit_cleanup(RERR_FILESELECT);
-+ }
-+
- f_name(file, fname + offset);
- if (remove_source_files) {
- if (do_unlink(fname) == 0) {
-@@ -224,6 +239,7 @@
- enum logcode log_code = log_before_transfer ? FLOG : FINFO;
- int f_xfer = write_batch < 0 ? batch_fd : f_out;
- int i, j;
-+ size_t l = 0;
-
- if (verbose > 2)
- rprintf(FINFO, "send_files starting\n");
-@@ -259,6 +275,20 @@
- fname[offset++] = '/';
- } else
- offset = 0;
-+
-+ l = offset + 1;
-+ if (file) {
-+ if (file->dirname)
-+ l += strlen(file->dirname);
-+ if (file->basename)
-+ l += strlen(file->basename);
-+ }
-+
-+ if (l >= sizeof(fname)) {
-+ rprintf(FERROR, "Overlong pathname\n");
-+ exit_cleanup(RERR_FILESELECT);
-+ }
-+
- fname2 = f_name(file, fname + offset);
-
- if (verbose > 2)
More information about the arch-commits
mailing list