Added patch. Closes #30307

2 files changed, 60 insertions, 0 deletions

diff --git a/net-misc/rdiff-backup/files/digest-rdiff-backup-0.12.5-r1 b/net-misc/rdiff-backup/files/digest-rdiff-backup-0.12.5-r1
new file mode 100644
index 000000000000..b8ea29370e9e
--- /dev/null
+++ b/net-misc/rdiff-backup/files/digest-rdiff-backup-0.12.5-r1
@@ -0,0 +1 @@
+MD5 6be2336c82743b422b9b25323011e497 rdiff-backup-0.12.5.tar.gz 123205
diff --git a/net-misc/rdiff-backup/files/rdiff-backup-0.12.5-unreadable-files.patch b/net-misc/rdiff-backup/files/rdiff-backup-0.12.5-unreadable-files.patch
new file mode 100644
index 000000000000..3c5103c349f2
--- /dev/null
+++ b/net-misc/rdiff-backup/files/rdiff-backup-0.12.5-unreadable-files.patch
@@ -0,0 +1,59 @@
+===================================================================
+RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/regress.py,v
+retrieving revision 1.6.2.4
+retrieving revision 1.6.2.5
+diff -u -r1.6.2.4 -r1.6.2.5
+--- rdiff-backup/rdiff-backup/rdiff_backup/regress.py	2003/09/28 04:34:39	1.6.2.4
++++ rdiff-backup/rdiff-backup/rdiff_backup/regress.py	2003/09/28 17:52:55	1.6.2.5
+@@ -114,27 +114,23 @@
+ def iterate_raw_rfs(mirror_rp, inc_rp):
+ 	"""Iterate all RegressFile objects in mirror/inc directory
+ 
+-	Also changes permissions of unreadable files to allow access and
+-	then changes them back later.
++	Also changes permissions of unreadable files.  We don't have to
++	change them back later because regress will do that for us.
+ 
+ 	"""
+ 	root_rf = RegressFile(mirror_rp, inc_rp, restore.get_inclist(inc_rp))
+ 	def helper(rf):
+ 		mirror_rp = rf.mirror_rp
+-		if (Globals.process_uid != 0 and
+-			((mirror_rp.isreg() and not mirror_rp.readable()) or
+-			 (mirror_rp.isdir() and not mirror_rp.hasfullperms()))):
+-			unreadable, old_perms = 1, mirror_rp.getperms()
+-			if mirror_rp.isreg(): mirror_rp.chmod(0400 | old_perms)
+-			else: mirror_rp.chmod(0700 | old_perms)
+-		else: unreadable = 0
++		if Globals.process_uid != 0:
++			if mirror_rp.isreg() and not mirror_rp.readable():
++				mirror_rp.chmod(0400 | mirror_rp.getperms())
++			elif mirror_rp.isdir() and not mirror_rp.hasfullperms():
++				mirror_rp.chmod(0700 | mirror_rp.getperms())
+ 		yield rf
+-		if unreadable and mirror_rp.isreg(): mirror_rp.chmod(old_perms)
+ 		if rf.mirror_rp.isdir() or rf.inc_rp.isdir():
+ 			for sub_rf in rf.yield_sub_rfs():
+ 				for sub_sub_rf in helper(sub_rf):
+ 					yield sub_sub_rf
+-		if unreadable and mirror_rp.isdir(): mirror_rp.chmod(old_perms)
+ 	return helper(root_rf)
+ 
+ def yield_metadata():
+@@ -249,14 +245,14 @@
+ 		if rf.mirror_rp.isreg():
+ 			tf = TempFile.new(rf.mirror_rp)
+ 			tf.write_from_fileobj(rf.get_restore_fp())
+-			rpath.copy_attribs(rf.metadata_rorp, tf)
+ 			tf.fsync_with_dir() # make sure tf fully written before move
++			rpath.copy_attribs(rf.metadata_rorp, tf)
+ 			rpath.rename(tf, rf.mirror_rp) # move is atomic
+ 		else:
+ 			if rf.mirror_rp.lstat(): rf.mirror_rp.delete()
+ 			rf.mirror_rp.write_from_fileobj(rf.get_restore_fp())
+ 			rpath.copy_attribs(rf.metadata_rorp, rf.mirror_rp)
+-		rf.mirror_rp.fsync_with_dir() # require move before inc delete
++		rf.mirror_rp.get_parent_rp().fsync() # require move before inc delete
+ 
+ 	def start_process(self, index, rf):
+ 		"""Start processing directory"""