From f63ea5cb8670a58ff25d75a798aeb4869ad5bd29 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 28 Apr 2015 17:23:42 +0100 Subject: [PATCH] Use --safe-links with rsync --- fdroidserver/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/server.py b/fdroidserver/server.py index 40b6dc13..c5496dee 100644 --- a/fdroidserver/server.py +++ b/fdroidserver/server.py @@ -123,7 +123,7 @@ def update_awsbucket(repo_section): def update_serverwebroot(serverwebroot, repo_section): # use a checksum comparison for accurate comparisons on different # filesystems, for example, FAT has a low resolution timestamp - rsyncargs = ['rsync', '--archive', '--delete'] + rsyncargs = ['rsync', '--archive', '--delete', '--safe-links'] if not options.no_checksum: rsyncargs.append('--checksum') if options.verbose: @@ -162,7 +162,7 @@ def update_serverwebroot(serverwebroot, repo_section): def _local_sync(fromdir, todir): - rsyncargs = ['rsync', '--recursive', '--links', '--times', '--perms', + rsyncargs = ['rsync', '--recursive', '--safe-links', '--times', '--perms', '--one-file-system', '--delete', '--chmod=Da+rx,Fa-x,a+r,u+w'] # use stricter rsync checking on all files since people using offline mode # are already prioritizing security above ease and speed