Fix cp errors, bug 122252.

(Portage version: 2.1_pre7-r4)

5 files changed, 107 insertions, 6 deletions

diff --git a/app-backup/rsnapshot/ChangeLog b/app-backup/rsnapshot/ChangeLog
index 1d976414c37a..0d6d974ac432 100644
--- a/app-backup/rsnapshot/ChangeLog
+++ b/app-backup/rsnapshot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/rsnapshot
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/ChangeLog,v 1.6 2005/11/08 18:51:17 ranger Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/ChangeLog,v 1.7 2006/04/13 10:11:43 kloeri Exp $
+
+*rsnapshot-1.2.1-r2 (13 Apr 2006)
+
+  13 Apr 2006; Bryan Østergaard <kloeri@gentoo.org
+  +files/rsnapshot-cp_al.patch, +rsnapshot-1.2.1-r2.ebuild:
+  Fix cp errors, bug 122252.
 
   08 Nov 2005; Brent Baude <ranger@gentoo.org> rsnapshot-1.2.1.ebuild:
   Marking rsnapshot-1.2.1 ppc64 stable
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index 9f43443db74e..a3b8d71bdc59 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -1,10 +1,39 @@
 MD5 85e04d0ecd0fcb428fde4d0b18e74d66 ChangeLog 3562
+RMD160 5bf12ac3efb0ce9eba504c46a3307a40d8f2e05c ChangeLog 3562
+SHA256 b58fb47f76a396b2126a711d6989e4c55559f355669021b23fb17220b4a39865 ChangeLog 3562
+MD5 d048e8113a23305b3583f6abb78850f5 files/digest-rsnapshot-1.1.7 66
+RMD160 caf6d51728891134cb2a0b9bdd94a9ee78e92652 files/digest-rsnapshot-1.1.7 66
+SHA256 f50c90fe364c199d5e5733ecbd92bf11299b7470828a20d87b31669c987cce2f files/digest-rsnapshot-1.1.7 66
+MD5 d048e8113a23305b3583f6abb78850f5 files/digest-rsnapshot-1.1.7-r1 66
+RMD160 caf6d51728891134cb2a0b9bdd94a9ee78e92652 files/digest-rsnapshot-1.1.7-r1 66
+SHA256 f50c90fe364c199d5e5733ecbd92bf11299b7470828a20d87b31669c987cce2f files/digest-rsnapshot-1.1.7-r1 66
+MD5 98526d4680fb46b5516a19e8c48956c4 files/digest-rsnapshot-1.2.1 67
+RMD160 747142bc43447e2061174dd368b6de2d82c5de8b files/digest-rsnapshot-1.2.1 67
+SHA256 f07800e7ffab1ed6c7f6fe377d76ce9972b78134aeec5fd11c8a226c54a4a9f7 files/digest-rsnapshot-1.2.1 67
+MD5 98526d4680fb46b5516a19e8c48956c4 files/digest-rsnapshot-1.2.1-r1 67
+RMD160 747142bc43447e2061174dd368b6de2d82c5de8b files/digest-rsnapshot-1.2.1-r1 67
+SHA256 f07800e7ffab1ed6c7f6fe377d76ce9972b78134aeec5fd11c8a226c54a4a9f7 files/digest-rsnapshot-1.2.1-r1 67
+MD5 c38e7dad2e74f18cad5dfd63dc238de7 files/digest-rsnapshot-1.2.1-r2 247
+RMD160 563163a582da2b46254d3bd1e75da52f288c4d28 files/digest-rsnapshot-1.2.1-r2 247
+SHA256 857b1042c411566311edf9b411cb6493909b002c2f51382f77f858246e134f70 files/digest-rsnapshot-1.2.1-r2 247
+MD5 a8b55aed39b8ca766bd2da8cb1768968 files/rsnapshot-cp_al.patch 526
+RMD160 f206a5a24bc7ea14cac847ef1fe34b9043211e61 files/rsnapshot-cp_al.patch 526
+SHA256 a416cd0038623743b80b2608a0452e76b784258de9029010f537f92bcbf165f6 files/rsnapshot-cp_al.patch 526
 MD5 3125bec127754bb5fb5fd85f47d9ff4c metadata.xml 202
+RMD160 3ed22b54d7e445ceb983306c27213cf899c9782c metadata.xml 202
+SHA256 2af9c1a29b355775cccb9abea682689a9f0a41b16269ee3a2f2d85faef7f00a9 metadata.xml 202
 MD5 d639d6e1c0f2eecf37c1933d5465cbf3 rsnapshot-1.1.7-r1.ebuild 1221
+RMD160 013dd9bd2ec4401178ff4e9e66a3019e39b5898d rsnapshot-1.1.7-r1.ebuild 1221
+SHA256 30a595d6d8036d617c3d8fbb2e74c39a9d01d1936e9e39950b90d2797278e9f7 rsnapshot-1.1.7-r1.ebuild 1221
 MD5 4058f968ca7c1fe8b0c9cb0733f25c65 rsnapshot-1.1.7.ebuild 1168
+RMD160 7d003bafba4d8deabab26af5a8a9a8c090736baa rsnapshot-1.1.7.ebuild 1168
+SHA256 4fb579fc6225e32981f1028dacc9f75ee70f397f8bac0e7c05a737493072e9f0 rsnapshot-1.1.7.ebuild 1168
 MD5 19b3d4c7c0e0d4d5b8573a03d5a279ad rsnapshot-1.2.1-r1.ebuild 1208
+RMD160 6fe34b9d29b2f36e1c5fb1b9a05577e0552ed218 rsnapshot-1.2.1-r1.ebuild 1208
+SHA256 0ce7e549de4c3b77f4d1f6fc5ba0c614e3de3146c6247899572edc4fcecccba1 rsnapshot-1.2.1-r1.ebuild 1208
+MD5 107f3676e9e32de58a32160e133867f2 rsnapshot-1.2.1-r2.ebuild 1281
+RMD160 a675b4683f4275819a1d27449c8ddfb68707bede rsnapshot-1.2.1-r2.ebuild 1281
+SHA256 03324d4b07ef86b6800bf11f3d2bfdd5a8b41f6166a7dd027693c97903ec1d3e rsnapshot-1.2.1-r2.ebuild 1281
 MD5 31c8a55a29145bf4aa69f42b62dd9276 rsnapshot-1.2.1.ebuild 1150
-MD5 d048e8113a23305b3583f6abb78850f5 files/digest-rsnapshot-1.1.7 66
-MD5 d048e8113a23305b3583f6abb78850f5 files/digest-rsnapshot-1.1.7-r1 66
-MD5 98526d4680fb46b5516a19e8c48956c4 files/digest-rsnapshot-1.2.1 67
-MD5 98526d4680fb46b5516a19e8c48956c4 files/digest-rsnapshot-1.2.1-r1 67
+RMD160 4fb2ff588c2fc94c4ffb4bae0d468d5388ec8f77 rsnapshot-1.2.1.ebuild 1150
+SHA256 fca7ad64d505451584a0d5bde2e7aeecd247f4f2b0d29dc785900288aa49df4b rsnapshot-1.2.1.ebuild 1150
diff --git a/app-backup/rsnapshot/files/digest-rsnapshot-1.2.1-r2 b/app-backup/rsnapshot/files/digest-rsnapshot-1.2.1-r2
new file mode 100644
index 000000000000..fc7c78ce50d7
--- /dev/null
+++ b/app-backup/rsnapshot/files/digest-rsnapshot-1.2.1-r2
@@ -0,0 +1,3 @@
+MD5 b126ae490889e5514f4a5d14a1128897 rsnapshot-1.2.1.tar.gz 137194
+RMD160 78d365b45c3a7dbe2034d901afe4937b39687946 rsnapshot-1.2.1.tar.gz 137194
+SHA256 ac47653bf2ddc6893269fc9950c169eb2d3e6427344cc160de22ec3f9fce7389 rsnapshot-1.2.1.tar.gz 137194
diff --git a/app-backup/rsnapshot/files/rsnapshot-cp_al.patch b/app-backup/rsnapshot/files/rsnapshot-cp_al.patch
new file mode 100644
index 000000000000..8d6c131a5b20
--- /dev/null
+++ b/app-backup/rsnapshot/files/rsnapshot-cp_al.patch
@@ -0,0 +1,12 @@
+diff -u -r -N rsnapshot-1.2.1/rsnapshot-program.pl rsnapshot-1.2.1-r2/rsnapshot-program.pl
+--- rsnapshot-1.2.1/rsnapshot-program.pl	2005-04-10 00:22:29.000000000 +0200
++++ rsnapshot-1.2.1-r2/rsnapshot-program.pl	2006-03-23 21:30:28.000000000 +0100
+@@ -2488,7 +2488,7 @@
+ 			if (0 == $test) {
+ 				$result = cp_al(
+ 							"$config_vars{'snapshot_root'}/$interval.0/",
+-							"$config_vars{'snapshot_root'}/$interval.1/"
++							"$config_vars{'snapshot_root'}/$interval.1"
+ 				);
+ 				if (! $result) {
+ 					my $errstr = '';
diff --git a/app-backup/rsnapshot/rsnapshot-1.2.1-r2.ebuild b/app-backup/rsnapshot/rsnapshot-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..556260b27ff1
--- /dev/null
+++ b/app-backup/rsnapshot/rsnapshot-1.2.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/rsnapshot-1.2.1-r2.ebuild,v 1.1 2006/04/13 10:11:43 kloeri Exp $
+
+inherit eutils
+
+DESCRIPTION="rsnapshot is a filesystem backup utility based on rsync."
+HOMEPAGE="http://www.rsnapshot.org"
+SRC_URI="http://www.rsnapshot.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.2
+		>=sys-apps/util-linux-2.12-r4
+		>=sys-apps/coreutils-5.0.91-r4
+		>=net-misc/openssh-3.7.1_p2-r1
+		>=net-misc/rsync-2.6.0"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/rsnapshot-cp_al.patch
+}
+
+src_compile() {
+	econf \
+		--prefix=/usr \
+		--sysconfdir=/etc || die
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "make install failed"
+
+	dodoc INSTALL README AUTHORS TODO
+	docinto utils
+	dodoc utils/{README,rsnaptar,*.sh}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The configuration file: /etc/rsnapshot.conf.default "
+	einfo "  has been installed. "
+	einfo "This is a template. "
+	einfo "Copy, or move, the above file to: /etc/rsnapshot.conf "
+	einfo "Note that upgrading will update the template, not real config. "
+	einfo
+}