[arch-commits] CVS update of extra/network/rsync (PKGBUILD rsync-2.6.9-fname-obo.diff)

[Tobias Powalowski]

    Date: Sunday, September 30, 2007 @ 07:01:43
  Author: tpowa
    Path: /home/cvs-extra/extra/network/rsync

   Added: rsync-2.6.9-fname-obo.diff (1.1)
Modified: PKGBUILD (1.32 -> 1.33)

'upgpkg: fixed security issue'


----------------------------+
 PKGBUILD                   |   11 +++++--
 rsync-2.6.9-fname-obo.diff |   60 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 4 deletions(-)


Index: extra/network/rsync/PKGBUILD
diff -u extra/network/rsync/PKGBUILD:1.32 extra/network/rsync/PKGBUILD:1.33
--- extra/network/rsync/PKGBUILD:1.32	Sun Nov 12 18:23:31 2006
+++ extra/network/rsync/PKGBUILD	Sun Sep 30 07:01:42 2007
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD,v 1.32 2006/11/12 23:23:31 judd Exp $
+# $Id: PKGBUILD,v 1.33 2007/09/30 11:01:42 tpowa Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=rsync
 pkgver=2.6.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=(i686 x86_64)
 url="http://samba.anu.edu.au/rsync/"
 backup=(etc/rsyncd.conf etc/xinetd.d/rsync)
+license=('GPL2')
 depends=('glibc')
 source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \
         rsyncd.conf rsyncd rsync.xinetd)
-md5sums=('996d8d8831dbca17910094e56dcb5942' '4395c0591638349b1a7aeaaa4da1f03a'\
-         '8e22dbda347b3de3fec9139a1c7e6e72' 'ea3e9277dc908bc51f9eddc0f6b935c1')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -22,3 +21,7 @@
   install -D -m 644 ../rsyncd.conf $startdir/pkg/etc/rsyncd.conf
   install -D -m 644 ../rsync.xinetd $startdir/pkg/etc/xinetd.d/rsync
 }
+md5sums=('996d8d8831dbca17910094e56dcb5942'
+         '4395c0591638349b1a7aeaaa4da1f03a'
+         '8e22dbda347b3de3fec9139a1c7e6e72'
+         'ea3e9277dc908bc51f9eddc0f6b935c1')
Index: extra/network/rsync/rsync-2.6.9-fname-obo.diff
diff -u /dev/null extra/network/rsync/rsync-2.6.9-fname-obo.diff:1.1
--- /dev/null	Sun Sep 30 07:01:42 2007
+++ extra/network/rsync/rsync-2.6.9-fname-obo.diff	Sun Sep 30 07:01:42 2007
@@ -0,0 +1,60 @@
+--- 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)