From 499fa6171953afec7524dfdf451d097d7db1c091 Mon Sep 17 00:00:00 2001 From: ehaupt Date: Sat, 31 May 2008 10:34:41 +0000 Subject: Merge a patch from cvs which fixes a file-globbing bug in the daemon when chroot is on. http://www.mail-archive.com/rsync-cvs@lists.samba.org/msg05785.html Submitted by: sem Obtained from: rsync cvs --- net/rsync/Makefile | 1 + net/rsync/files/patch-utils.c | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 net/rsync/files/patch-utils.c (limited to 'net/rsync') diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 272a1457c60e..9c0c5dc97ef7 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -7,6 +7,7 @@ PORTNAME= rsync PORTVERSION= 3.0.2 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://ftp.samba.org/pub/%SUBDIR%/ \ diff --git a/net/rsync/files/patch-utils.c b/net/rsync/files/patch-utils.c new file mode 100644 index 000000000000..1a998a268cc4 --- /dev/null +++ b/net/rsync/files/patch-utils.c @@ -0,0 +1,11 @@ +--- util.c.orig 2008-05-30 20:02:16.000000000 +0400 ++++ util.c 2008-05-30 20:04:01.000000000 +0400 +@@ -582,7 +582,7 @@ + } else + use_buf = glob.arg_buf; + +- if (from_glob || arg) { ++ if (from_glob || (arg && len)) { + STRUCT_STAT st; + int is_dir; + -- cgit