aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2008-05-31 10:34:41 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2008-05-31 10:34:41 +0000
commit09405f8ee1cfefe15484684c55c1d65aa6cf7b35 (patch)
tree4d303e8e32212475e8c8135c4b756508ca28bf04
parentc4297de97aba5335c1edec1b9a0846098f2a3e8a (diff)
downloadports-09405f8ee1cfefe15484684c55c1d65aa6cf7b35.tar.gz
ports-09405f8ee1cfefe15484684c55c1d65aa6cf7b35.zip
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
Notes
Notes: svn path=/head/; revision=214016
-rw-r--r--net/rsync/Makefile1
-rw-r--r--net/rsync/files/patch-utils.c11
2 files changed, 12 insertions, 0 deletions
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;
+