Added patch. Closes #30307

8 files changed, 108 insertions, 12 deletions

diff --git a/net-misc/rdiff-backup/ChangeLog b/net-misc/rdiff-backup/ChangeLog
index 912a86e9c511..c529ca0beb66 100644
--- a/net-misc/rdiff-backup/ChangeLog
+++ b/net-misc/rdiff-backup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/rdiff-backup
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/ChangeLog,v 1.16 2003/09/29 18:19:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/ChangeLog,v 1.17 2003/10/05 11:09:14 mholzer Exp $
+
+*rdiff-backup-0.12.5-r1 (06 Oct 2003)
+
+  06 Oct 2003; Martin Holzer <mholzer@gentoo.org> rdiff-backup-0.12.4.ebuild,
+  rdiff-backup-0.12.5-r1.ebuild, rdiff-backup-0.12.5.ebuild,
+  rdiff-backup-0.8.0.ebuild, files/rdiff-backup-0.12.5-unreadable-files.patch:
+  Added patch. Closes #30307
 
 *rdiff-backup-0.12.5 (29 Sep 2003)
 
diff --git a/net-misc/rdiff-backup/Manifest b/net-misc/rdiff-backup/Manifest
index a9819f2a0168..161044e982d0 100644
--- a/net-misc/rdiff-backup/Manifest
+++ b/net-misc/rdiff-backup/Manifest
@@ -1,8 +1,8 @@
-MD5 0fd3ce94a4195d0c88aa585078f5d4f9 ChangeLog 2550
-MD5 4366b284f425db0ff9fb293e8736884b rdiff-backup-0.12.4.ebuild 634
-MD5 9b0b7f3224e3c61e16c6955449f90fd3 rdiff-backup-0.8.0.ebuild 688
-MD5 d8a26b3d831c1906b0692c0665661ea9 rdiff-backup-0.12.5.ebuild 635
-MD5 fb1b2f8215ac10349c49c2ac408200de rdiff-backup-0.12.5-r1.ebuild 722
+MD5 e5a739d1498b53fd759a44f27b9f34c2 ChangeLog 2837
+MD5 e930c23e40a5056768659b1b3521d8b5 rdiff-backup-0.12.4.ebuild 634
+MD5 ec538ce2c97b120495ddc179382c87de rdiff-backup-0.8.0.ebuild 689
+MD5 7facf0ec77e4dc6d480685f568645608 rdiff-backup-0.12.5.ebuild 635
+MD5 b29488c916b6e4afb2b585077163ed61 rdiff-backup-0.12.5-r1.ebuild 726
 MD5 0d23592917cdd7fb4d50825cb439edb8 files/digest-rdiff-backup-0.12.5-r1 71
 MD5 27a4b1877434caf96bb409b5f6a1f511 files/digest-rdiff-backup-0.8.0 69
 MD5 5c6ac6488726f62288dc006e078d7507 files/rpath.patch 692
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"""
diff --git a/net-misc/rdiff-backup/rdiff-backup-0.12.4.ebuild b/net-misc/rdiff-backup/rdiff-backup-0.12.4.ebuild
index f8da79855511..211aee6a5176 100644
--- a/net-misc/rdiff-backup/rdiff-backup-0.12.4.ebuild
+++ b/net-misc/rdiff-backup/rdiff-backup-0.12.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/rdiff-backup-0.12.4.ebuild,v 1.1 2003/09/29 18:19:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/rdiff-backup-0.12.4.ebuild,v 1.2 2003/10/05 11:09:14 mholzer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Remote incremental file backup utility, similar to rsync but more reliable"
 SRC_URI="http://rdiff-backup.stanford.edu/${P}.tar.gz"
 HOMEPAGE="http://rdiff-backup.stanford.edu"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc"
 SLOT="0"
 
 RDEPEND=">=net-libs/librsync-0.9.6"
diff --git a/net-misc/rdiff-backup/rdiff-backup-0.12.5-r1.ebuild b/net-misc/rdiff-backup/rdiff-backup-0.12.5-r1.ebuild
new file mode 100644
index 000000000000..1c4cd6fffbbe
--- /dev/null
+++ b/net-misc/rdiff-backup/rdiff-backup-0.12.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/rdiff-backup-0.12.5-r1.ebuild,v 1.1 2003/10/05 11:09:14 mholzer Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Remote incremental file backup utility, similar to rsync but more reliable"
+SRC_URI="http://rdiff-backup.stanford.edu/${P}.tar.gz"
+HOMEPAGE="http://rdiff-backup.stanford.edu"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+SLOT="0"
+
+RDEPEND=">=net-libs/librsync-0.9.6"
+
+inherit distutils
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-unreadable-files.patch
+}
+
+src_compile() {
+	distutils_src_compile
+}
+
+src_install() {
+	distutils_src_install
+}
diff --git a/net-misc/rdiff-backup/rdiff-backup-0.12.5.ebuild b/net-misc/rdiff-backup/rdiff-backup-0.12.5.ebuild
index 89c52652b324..1dd31b0c2acb 100644
--- a/net-misc/rdiff-backup/rdiff-backup-0.12.5.ebuild
+++ b/net-misc/rdiff-backup/rdiff-backup-0.12.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/rdiff-backup-0.12.5.ebuild,v 1.1 2003/09/29 18:19:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/rdiff-backup-0.12.5.ebuild,v 1.2 2003/10/05 11:09:14 mholzer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Remote incremental file backup utility, similar to rsync but more reliable"
 SRC_URI="http://rdiff-backup.stanford.edu/${P}.tar.gz"
 HOMEPAGE="http://rdiff-backup.stanford.edu"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc"
 SLOT="0"
 
 RDEPEND=">=net-libs/librsync-0.9.6"
diff --git a/net-misc/rdiff-backup/rdiff-backup-0.8.0.ebuild b/net-misc/rdiff-backup/rdiff-backup-0.8.0.ebuild
index 081ce4a280f7..68cf3c062fb5 100644
--- a/net-misc/rdiff-backup/rdiff-backup-0.8.0.ebuild
+++ b/net-misc/rdiff-backup/rdiff-backup-0.8.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/rdiff-backup-0.8.0.ebuild,v 1.7 2003/02/13 15:05:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdiff-backup/rdiff-backup-0.8.0.ebuild,v 1.8 2003/10/05 11:09:14 mholzer Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Remote incremental file backup utility, similar to rsync but more reliable"
 SRC_URI="http://www.stanford.edu/~bescoto/rdiff-backup/${P}.tar.gz"
 HOMEPAGE="http://www.stanford.edu/~bescoto/rdiff-backup/"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 SLOT="0"
 
 DEPEND=">=net-libs/librsync-0.9.5