From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 11 14:30:29 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA2C816A4D1 for ; Mon, 11 Oct 2004 14:30:29 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D6D243D3F for ; Mon, 11 Oct 2004 14:30:29 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9BEUTnE007601 for ; Mon, 11 Oct 2004 14:30:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9BEUTcl007598; Mon, 11 Oct 2004 14:30:29 GMT (envelope-from gnats) Resent-Date: Mon, 11 Oct 2004 14:30:29 GMT Resent-Message-Id: <200410111430.i9BEUTcl007598@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marcus Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 753A216A4CE; Mon, 11 Oct 2004 14:21:09 +0000 (GMT) Received: from out01.grupos.com.br (out01.grupos.com.br [200.203.183.77]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94DEB43D41; Mon, 11 Oct 2004 14:21:08 +0000 (GMT) (envelope-from marcus@corp.grupos.com.br) Received: from corp.grupos.com.br (unknown [150.162.166.55]) by out01.grupos.com.br (Postfix) with ESMTP id 90DFF3F69; Mon, 11 Oct 2004 11:21:05 -0300 (BRT) Received: by corp.grupos.com.br (Postfix, from userid 1001) id 6EE1920A22; Mon, 11 Oct 2004 11:21:05 -0300 (BRT) Message-Id: <20041011142105.6EE1920A22@corp.grupos.com.br> Date: Mon, 11 Oct 2004 11:21:05 -0300 (BRT) From: Marcus Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: eik@FreeBSD.org Subject: ports/72516: Update net/rsync from 2.6.2_3 to 2.6.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Oct 2004 14:30:29 -0000 >Number: 72516 >Category: ports >Synopsis: Update net/rsync from 2.6.2_3 to 2.6.3 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Oct 11 14:30:29 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Marcus Grando >Release: FreeBSD 4.10-STABLE i386 >Organization: Grupos Internet S/A >Environment: System: FreeBSD corp.grupos.com.br 4.10-STABLE FreeBSD 4.10-STABLE #26: Tue Sep 21 15:07:10 BRT 2004 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386 >Description: Update net/rsync from 2.6.2_3 to 2.6.3 >How-To-Repeat: >Fix: --begin-- diff -ruN rsync.old/Makefile rsync/Makefile --- rsync.old/Makefile Tue Aug 24 13:30:50 2004 +++ rsync/Makefile Mon Oct 11 11:11:30 2004 @@ -6,8 +6,8 @@ # PORTNAME= rsync -PORTVERSION= 2.6.2 -PORTREVISION= 3 +PORTVERSION= 2.6.3 +#PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://sunsite.auc.dk/pub/unix/%SUBDIR%/ \ diff -ruN rsync.old/distinfo rsync/distinfo --- rsync.old/distinfo Tue Aug 24 13:30:50 2004 +++ rsync/distinfo Mon Oct 11 11:12:02 2004 @@ -1,4 +1,2 @@ -MD5 (rsync-2.6.2.tar.gz) = bcacd9a9108a9e4760832212ec3d658d -SIZE (rsync-2.6.2.tar.gz) = 515402 -MD5 (rsync-2.6.2-2.6.3pre1.diffs.gz) = 2ecd11b83c06a18c764ccee5dbdb25ab -SIZE (rsync-2.6.2-2.6.3pre1.diffs.gz) = 102947 +MD5 (rsync-2.6.3.tar.gz) = 2beb30caafa69a01182e71c528fb0393 +SIZE (rsync-2.6.3.tar.gz) = 583453 diff -ruN rsync.old/files/patch-backup.c rsync/files/patch-backup.c --- rsync.old/files/patch-backup.c Thu Aug 12 07:45:27 2004 +++ rsync/files/patch-backup.c Wed Dec 31 21:00:00 1969 @@ -1,48 +0,0 @@ -# -# fix --backup-dir -# -# ---- backup.c 13 Mar 2004 20:18:03 -0000 1.28 -+++ backup.c 4 May 2004 03:06:52 -0000 -@@ -169,8 +169,9 @@ static int keep_backup(char *fname) - /* Check to see if this is a device file, or link */ - if (IS_DEVICE(file->mode)) { - if (am_root && preserve_devices) { -- make_bak_dir(backup_dir_buf); -- if (do_mknod(backup_dir_buf, file->mode, file->u.rdev) != 0) { -+ if (do_mknod(backup_dir_buf, file->mode, file->u.rdev) < 0 -+ && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0 -+ || do_mknod(backup_dir_buf, file->mode, file->u.rdev) < 0)) { - rprintf(FERROR, "mknod %s failed: %s\n", - full_fname(backup_dir_buf), strerror(errno)); - } else if (verbose > 2) { -@@ -186,10 +187,14 @@ static int keep_backup(char *fname) - - if (!kept && S_ISDIR(file->mode)) { - /* make an empty directory */ -- make_bak_dir(backup_dir_buf); -- do_mkdir(backup_dir_buf, file->mode); -- ret_code = do_rmdir(fname); -+ if (do_mkdir(backup_dir_buf, file->mode) < 0 -+ && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0 -+ || do_mkdir(backup_dir_buf, file->mode) < 0)) { -+ rprintf(FINFO, "mkdir %s failed: %s\n", -+ full_fname(backup_dir_buf), strerror(errno)); -+ } - -+ ret_code = do_rmdir(fname); - if (verbose > 2) { - rprintf(FINFO, "make_backup: RMDIR %s returns %i\n", - full_fname(fname), ret_code); -@@ -207,8 +212,9 @@ static int keep_backup(char *fname) - } - kept = 1; - } -- make_bak_dir(backup_dir_buf); -- if (do_symlink(file->u.link, backup_dir_buf) != 0) { -+ if (do_symlink(file->u.link, backup_dir_buf) < 0 -+ && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0 -+ || do_symlink(file->u.link, backup_dir_buf) < 0)) { - rprintf(FERROR, "link %s -> %s : %s\n", - full_fname(backup_dir_buf), file->u.link, strerror(errno)); - } diff -ruN rsync.old/files/patch-flist.c rsync/files/patch-flist.c --- rsync.old/files/patch-flist.c Thu Aug 12 07:45:27 2004 +++ rsync/files/patch-flist.c Wed Dec 31 21:00:00 1969 @@ -1,23 +0,0 @@ -# -# fix --delete SEGV -# -# ---- flist.c 29 Apr 2004 19:37:15 -0000 1.218 -+++ flist.c 3 May 2004 01:24:10 -0000 1.220 -@@ -539,6 +539,7 @@ void receive_file_entry(struct file_stru - rdev_major = 0; - uid = 0, gid = 0; - *lastname = '\0'; -+ lastdir_len = -1; - return; - } - -@@ -745,7 +746,7 @@ struct file_struct *make_file(char *fnam - char *basename, *dirname, *bp; - unsigned short flags = 0; - -- if (!flist) /* lastdir isn't valid if flist is NULL */ -+ if (!flist || !flist->count) /* Ignore lastdir when invalid. */ - lastdir_len = -1; - - if (strlcpy(thisname, fname, sizeof thisname) diff -ruN rsync.old/files/patch-generator.c rsync/files/patch-generator.c --- rsync.old/files/patch-generator.c Thu Aug 12 07:45:27 2004 +++ rsync/files/patch-generator.c Wed Dec 31 21:00:00 1969 @@ -1,23 +0,0 @@ -# -# fix --read-batch -# -# ---- generator.c.orig Thu Apr 15 18:55:23 2004 -+++ generator.c Wed May 12 13:55:13 2004 -@@ -46,6 +46,7 @@ - extern int whole_file; - extern int local_server; - extern int write_batch; -+extern int read_batch; - extern int list_only; - extern int only_existing; - extern int orig_umask; -@@ -213,7 +214,7 @@ - { - if (whole_file > 0) - return True; -- if (whole_file == 0 || write_batch) -+ if (whole_file == 0 || write_batch || read_batch) - return False; - return local_server; - } diff -ruN rsync.old/files/patch-test.sh rsync/files/patch-test.sh --- rsync.old/files/patch-test.sh Sun Nov 16 21:08:12 2003 +++ rsync/files/patch-test.sh Wed Dec 31 21:00:00 1969 @@ -1,11 +0,0 @@ ---- test.sh.orig Sun Nov 16 20:30:24 2003 -+++ test.sh Sun Nov 16 20:30:40 2003 -@@ -165,7 +165,7 @@ - - rm -rf ${TO} - mkdir -p ${FROM}2/dir/subdir --cp -a ${FROM}/dir/subdir/subsubdir ${FROM}2/dir/subdir -+cp -pR ${FROM}/dir/subdir/subsubdir ${FROM}2/dir/subdir - cp ${FROM}/dir/* ${FROM}2/dir 2>/dev/null - runtest "excludes" 'checkit "$RSYNC -vv -Hlrt --delete --include /dir/ --include /dir/\* --include /dir/\*/subsubdir --include /dir/\*/subsubdir/\*\* --exclude \*\* ${FROM}/dir ${TO}" ${FROM}2/ ${TO}' - rm -r ${FROM}2 diff -ruN rsync.old/files/patch-util.c rsync/files/patch-util.c --- rsync.old/files/patch-util.c Thu Aug 12 07:45:27 2004 +++ rsync/files/patch-util.c Wed Dec 31 21:00:00 1969 @@ -1,15 +0,0 @@ -# -# fix security hole in non-chroot rsync daemon -# -# ---- orig/util.c 2004-04-27 12:59:37 -0700 -+++ util.c 2004-08-11 23:37:27 -0700 -@@ -743,7 +743,7 @@ - allowdotdot = 1; - } else { - p += 2; -- if (*p == '/') -+ while (*p == '/') - p++; - if (sanp != start) { - /* back up sanp one level */ --end-- find . -empty -o -name \*.orig | xargs rm >Release-Note: >Audit-Trail: >Unformatted: