From 466d1ca5be4d4dcf94667ae064b39780e51e211f Mon Sep 17 00:00:00 2001 From: Torsten Kurbad Date: Tue, 13 Apr 2010 14:20:47 +0000 Subject: [PATCH] Added modified version of rsnapshot git-svn-id: svn+ssh://svnintern.kmrc.de/projects/gentoo/iwm-overlay@12988 cbe59ace-07ea-0310-918e-868702b5370d --- app-backup/rsnapshot/ChangeLog | 203 ++++++++++++++++++ app-backup/rsnapshot/Manifest | 6 + .../files/rsnapshot-1.3.1-cp_al.patch | 12 ++ .../files/rsnapshot-1.3.1-mount_args.patch | 86 ++++++++ app-backup/rsnapshot/metadata.xml | 16 ++ app-backup/rsnapshot/rsnapshot-1.3.1.ebuild | 53 +++++ 6 files changed, 376 insertions(+) create mode 100644 app-backup/rsnapshot/ChangeLog create mode 100644 app-backup/rsnapshot/Manifest create mode 100644 app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch create mode 100644 app-backup/rsnapshot/files/rsnapshot-1.3.1-mount_args.patch create mode 100644 app-backup/rsnapshot/metadata.xml create mode 100644 app-backup/rsnapshot/rsnapshot-1.3.1.ebuild diff --git a/app-backup/rsnapshot/ChangeLog b/app-backup/rsnapshot/ChangeLog new file mode 100644 index 0000000..c5fff91 --- /dev/null +++ b/app-backup/rsnapshot/ChangeLog @@ -0,0 +1,203 @@ +# ChangeLog for app-backup/rsnapshot +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/ChangeLog,v 1.27 2010/03/04 22:31:47 fauli Exp $ + + 04 Mar 2010; Christian Faulhammer + -files/rsnapshot-1.2.9-cp_al.patch, -files/rsnapshot-1.3.0-cp_al.patch, + -files/rsnapshot-cp_al.patch: + clean up stray patches + + 03 Mar 2010; Christian Faulhammer + -rsnapshot-1.1.7.ebuild, -rsnapshot-1.1.7-r1.ebuild, + -rsnapshot-1.2.1.ebuild, -rsnapshot-1.2.1-r1.ebuild, + -rsnapshot-1.2.1-r2.ebuild, -rsnapshot-1.2.9.ebuild, + -rsnapshot-1.3.0.ebuild: + clean up + + 12 Oct 2009; Mark Loeser rsnapshot-1.1.7.ebuild, + rsnapshot-1.1.7-r1.ebuild, rsnapshot-1.2.1.ebuild, + rsnapshot-1.2.1-r1.ebuild, rsnapshot-1.2.1-r2.ebuild, + rsnapshot-1.2.9.ebuild, rsnapshot-1.3.0.ebuild: + QA fixes; unquoted variables + + 10 Jan 2009; Tobias Klausmann + rsnapshot-1.3.1.ebuild: + Stable on alpha, bug #249464 + + 09 Jan 2009; Brent Baude rsnapshot-1.3.1.ebuild: + stable ppc, bug 249464 + + 07 Jan 2009; Brent Baude rsnapshot-1.3.1.ebuild: + stable ppc64, bug 249464 + + 04 Jan 2009; Markus Meier rsnapshot-1.3.1.ebuild: + amd64/x86 stable, bug #249464 + + 04 Jan 2009; Friedrich Oslage + rsnapshot-1.3.1.ebuild: + Stable on sparc, bug #249464 + +*rsnapshot-1.3.1 (11 Sep 2008) + + 11 Sep 2008; Ben de Groot + +files/rsnapshot-1.3.1-cp_al.patch, metadata.xml, +rsnapshot-1.3.1.ebuild: + Version bump and assigning to proxied maintainer Erik Hahn + + 21 Apr 2008; Christian Heim metadata.xml: + Fix up metadata.xml. If there's no maintainer for the package, the metadata + also needs to contain m-needed@g.o. + + 31 May 2007; Bryan Østergaard metadata.xml: + Remove myself as I'm retiring. + + 13 May 2007; Thilo Bangert metadata.xml: + add herd + + 24 Jan 2007; Marius Mauch rsnapshot-1.1.7.ebuild, + rsnapshot-1.1.7-r1.ebuild, rsnapshot-1.2.1.ebuild, + rsnapshot-1.2.1-r1.ebuild, rsnapshot-1.2.1-r2.ebuild, + rsnapshot-1.2.9.ebuild, rsnapshot-1.3.0.ebuild: + Replacing einfo with elog + +*rsnapshot-1.3.0 (27 Nov 2006) + + 27 Nov 2006; Bryan Østergaard + +files/rsnapshot-1.3.0-cp_al.patch, +rsnapshot-1.3.0.ebuild: + Version bump, bug 155972. Thanks to Alexander Skwar for providing the ebuild. + + 14 Sep 2006; Danny van Dyk rsnapshot-1.2.9.ebuild: + Marked stable on amd64 wrt bug #146719. + + 24 Aug 2006; Markus Rothe rsnapshot-1.2.9.ebuild: + Stable on ppc64 + + 23 Aug 2006; Bryan Østergaard rsnapshot-1.2.9.ebuild: + Stable on x86 + alpha. + +*rsnapshot-1.2.9 (01 Jul 2006) + + 01 Jul 2006; Bryan Østergaard + +files/rsnapshot-1.2.9-cp_al.patch, +rsnapshot-1.2.9.ebuild: + Version bump, bug 135199. + + 27 Apr 2006; Marien Zwart + files/digest-rsnapshot-1.1.7, files/digest-rsnapshot-1.1.7-r1, + files/digest-rsnapshot-1.2.1, files/digest-rsnapshot-1.2.1-r1, + files/digest-rsnapshot-1.2.1-r2, Manifest: + Fixing SHA256 digest for real, pass three... + + 27 Apr 2006; Marien Zwart + files/digest-rsnapshot-1.1.7, files/digest-rsnapshot-1.1.7-r1, + files/digest-rsnapshot-1.2.1, files/digest-rsnapshot-1.2.1-r1, + files/digest-rsnapshot-1.2.1-r2, Manifest: + Fixing SHA256 digest, pass two. + +*rsnapshot-1.2.1-r2 (13 Apr 2006) + + 13 Apr 2006; Bryan Østergaard rsnapshot-1.2.1.ebuild: + Marking rsnapshot-1.2.1 ppc64 stable + +*rsnapshot-1.2.1-r1 (29 Sep 2005) +*rsnapshot-1.1.7-r1 (29 Sep 2005) + + 29 Sep 2005; Bryan Østergaard + +rsnapshot-1.1.7-r1.ebuild, +rsnapshot-1.2.1-r1.ebuild: + Also install examples, patch by Felipe Massia Pereira. + + 12 Sep 2005; Ferris McCormick rsnapshot-1.2.1.ebuild: + Add ~sparc keyword. Seems to work fine, and has been recommended as one + vehicle for backing up toucan directories. + + 04 Aug 2005; Brent Baude rsnapshot-1.2.1.ebuild: + Marked ~ppc64 for testing. + + 04 Jul 2005; Robin H. Johnson +metadata.xml, + +rsnapshot-1.1.7.ebuild, +rsnapshot-1.2.1.ebuild: + Moved from net-misc/rsnapshot to app-backup/rsnapshot. + + 21 May 2005; Simon Stelling rsnapshot-1.2.1.ebuild: + stable on amd64 + + 15 May 2005; Bryan Østergaard rsnapshot-1.1.7.ebuild, + rsnapshot-1.2.1.ebuild: + Add some missing docs, bug 92671. + +*rsnapshot-1.1.7 (13 Apr 2005) + + 13 Apr 2005; Bryan Østergaard + +rsnapshot-1.1.7.ebuild: + Latest 1.1.x version. + + 12 Apr 2005; Bryan Østergaard + -rsnapshot-1.1.6.ebuild, -rsnapshot-1.2.0.ebuild: + Remove old, vulnerable versions. + +*rsnapshot-1.2.1 (11 Apr 2005) + + 11 Apr 2005; Bryan Østergaard + +rsnapshot-1.2.1.ebuild: + Security bump, x86 + alpha stable, bug 88681. + + 11 Mar 2005; Jan Brinkmann rsnapshot-1.2.0.ebuild: + added ~amd64 to KEYWORDS, fixes #65040 + +*rsnapshot-1.2.0 (12 Feb 2005) + + 12 Feb 2005; Bryan Østergaard + +rsnapshot-1.2.0.ebuild: + Version bump. + + 29 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 04 Oct 2004; Bryan Østergaard -rsnapshot-1.1.4.ebuild, + -rsnapshot-1.1.5.ebuild: + Remove old versions. + + 26 Aug 2004; Bryan Østergaard rsnapshot-1.1.6.ebuild: + x86 stable bump. + +*rsnapshot-1.1.6 (12 Jul 2004) + + 12 Jul 2004; Bryan Østergaard +rsnapshot-1.1.6.ebuild: + Version bump, keyword ~alpha. + +*rsnapshot-1.1.5 (28 Jun 2004) + + 28 Jun 2004; Bryan Østergaard -rsnapshot-1.1.0.ebuild, + -rsnapshot-1.1.2.ebuild, -rsnapshot-1.1.3.ebuild, rsnapshot-1.1.4.ebuild, + +rsnapshot-1.1.5.ebuild: + Version bump thanks to Martin Egge . Also + removed old versions. + +*rsnapshot-1.1.4 (02 Jun 2004) + + 02 Jun 2004; Bryan Østergaard +metadata.xml, + +rsnapshot-1.1.4.ebuild: + Bump version and add metadata.xml, see bug 52791. + +*rsnapshot-1.1.3 (01 May 2004) + + 01 May 2004; Bryan Østergaard +rsnapshot-1.1.3.ebuild: + Bump version, bug #49612. + + 28 Apr 2004; David Holm rsnapshot-1.1.2.ebuild: + Added to ~ppc. + +*rsnapshot-1.1.2 (27 Apr 2004) + + 27 Apr 2004; Martin Holzer rsnapshot-1.1.2.ebuild: + Version bumped. + + 19 Mar 2004; Michael Sterrett rsnapshot-1.1.0.ebuild: + fix depend (bug #45110); tidy + +*rsnapshot-1.1.0 (01 Mar 2004) + + 01 Mar 2004; Martin Holzer rsnapshot-1.1.0.ebuild: + Initial ebuild. Submitted by AgenT in 40977. + diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest new file mode 100644 index 0000000..6e6caa8 --- /dev/null +++ b/app-backup/rsnapshot/Manifest @@ -0,0 +1,6 @@ +AUX rsnapshot-1.3.1-cp_al.patch 535 RMD160 252a8254223a6a22bc0d8f94bd38a1aa91dfe6c6 SHA1 2cd3d0972c048907d4943891a96f21c99a4b2408 SHA256 a20a3b23d19c657e8cda47fd7f755bd5c9386c9df73f20660429a3588047e168 +AUX rsnapshot-1.3.1-mount_args.patch 2701 RMD160 cfd2368fb62c3331b5eaf23b00ee536dc857609c SHA1 60da59226378bc8e4ba5e0bf5bb15af4a4c811d9 SHA256 882dad9af1fa25cbbc4e67afe6529ac65e0675e1eac0e7f3b694337de4c04141 +DIST rsnapshot-1.3.1.tar.gz 215806 RMD160 948ee5669c5da0728f607007da4d5fbbcfcdd8c7 SHA1 a3aa3560dc389e1b00155a5869558522c4a29e05 SHA256 94b6c77e40628935f42a191bdc28ad93b1f132fde456ee76ee87763f1eddc75e +EBUILD rsnapshot-1.3.1.ebuild 1416 RMD160 6baee9d8097c190df211ffb4f92534f180f1880f SHA1 a9aedd2b55f73862edea60d297e5da1d512455c2 SHA256 d22c844e0f92595150d31bbc79e81577be4b4f11b2cc56cec3f480e948671555 +MISC ChangeLog 7061 RMD160 9f43ebbbcff42fda59835349f58ea9bba8ff2444 SHA1 5eaed1f809b415715d37170d68a287a31a0d9115 SHA256 5d1d376dedfd0110217e2f06a403eb5c9599d2f5a62c1de68b1cc8580389fd31 +MISC metadata.xml 459 RMD160 834cb77448df6758e8c5bd5d0d3f339283c99896 SHA1 6fe3b269a46854b16edead108beb61270dad6e24 SHA256 563809dbf03d7e0b3f9e814670d3cb3cc102ab2910f2187fc6f3ace3aee18d72 diff --git a/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch new file mode 100644 index 0000000..7241d6c --- /dev/null +++ b/app-backup/rsnapshot/files/rsnapshot-1.3.1-cp_al.patch @@ -0,0 +1,12 @@ +diff -ur rsnapshot-1.3.1.original/rsnapshot-program.pl rsnapshot-1.3.1/rsnapshot-program.pl +--- rsnapshot-1.3.1.original/rsnapshot-program.pl 2006-10-21 08:12:30.000000000 +0200 ++++ rsnapshot-1.3.1/rsnapshot-program.pl 2006-11-22 21:37:39.133222510 +0100 +@@ -3269,7 +3269,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/files/rsnapshot-1.3.1-mount_args.patch b/app-backup/rsnapshot/files/rsnapshot-1.3.1-mount_args.patch new file mode 100644 index 0000000..a5275c5 --- /dev/null +++ b/app-backup/rsnapshot/files/rsnapshot-1.3.1-mount_args.patch @@ -0,0 +1,86 @@ +diff -urN rsnapshot-1.3.1.orig//rsnapshot.1 rsnapshot-1.3.1/rsnapshot.1 +--- rsnapshot-1.3.1.orig//rsnapshot.1 2008-08-31 13:23:26.000000000 +0200 ++++ rsnapshot-1.3.1/rsnapshot.1 2010-04-13 16:17:13.696067710 +0200 +@@ -281,6 +281,16 @@ + .RE + .RS 4 + .Sp ++\&\fBmount_args\fR ++.Sp ++.RS 4 ++List of arguments to pass to the mount command for LVM snapshots, ++e.g. \*(L"-onouuid\*(R" for succesful XFS mounts. If not specified, ++mount is called without arguments, which should suffice in most cases. ++.RE ++.RE ++.RS 4 ++.Sp + \&\fBretain\fR [name] [number] + .Sp + .RS 4 +diff -urN rsnapshot-1.3.1.orig//rsnapshot-program.pl rsnapshot-1.3.1/rsnapshot-program.pl +--- rsnapshot-1.3.1.orig//rsnapshot-program.pl 2010-04-13 16:05:09.147400779 +0200 ++++ rsnapshot-1.3.1/rsnapshot-program.pl 2010-04-13 16:18:02.130041897 +0200 +@@ -158,6 +158,7 @@ + my $default_rsync_long_args = '--delete --numeric-ids --relative --delete-excluded'; + my $default_ssh_args = undef; + my $default_du_args = '-csh'; ++my $default_mount_args = ''; + + # set default for use_lazy_deletes + my $use_lazy_deletes = 0; # do not delete the oldest archive until after backup +@@ -786,6 +787,12 @@ + next; + } + } ++ # CHECK FOR mount_args (optional) ++ if ($var eq 'mount_args') { ++ $config_vars{'mount_args'} = $value; ++ $line_syntax_ok = 1; ++ next; ++ } + # CHECK FOR umount (optional) + if ($var eq 'linux_lvm_cmd_umount') { + if ((-f "$value") && (-x "$value") && (1 == is_real_local_abs_path($value))) { +@@ -1475,7 +1482,13 @@ + } + $config_vars{'rsync_long_args'} .= " $rsync_include_file_args"; + } +- ++ # set mount_args ++ if (defined($config_vars{'linux_lvm_cmd_mount'})) { ++ if (!defined($config_vars{'mount_args'})) { ++ $config_vars{'mount_args'} = $default_mount_args; ++ } ++ } ++ + ############################################### + # NOW THAT THE CONFIG FILE HAS BEEN READ IN, # + # DO A SANITY CHECK ON THE DATA WE PULLED OUT # +@@ -3523,7 +3536,8 @@ + $linux_lvm_snapshotname = join('/', $config_vars{'linux_lvm_vgpath'}, $linux_lvmvgname, $config_vars{'linux_lvm_snapshotname'}); + push(@cmd_stack, $linux_lvm_snapshotname); + push(@cmd_stack, $config_vars{'linux_lvm_mountpath'}); +- ++ push(@cmd_stack, $config_vars{'mount_args'}); ++ + print_cmd(@cmd_stack); + if (0 == $test) { + $result = system(@cmd_stack); +@@ -6222,6 +6236,16 @@ + + =back + ++B ++ ++=over 4 ++ ++List of arguments to pass to the mount command for LVM snapshots, ++e.g. "-onouuid" for succesful XFS mounts. If not specified, ++mount is called without arguments, which should suffice in most cases. ++ ++=back ++ + B [name] [number] + + =over 4 diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml new file mode 100644 index 0000000..0db4744 --- /dev/null +++ b/app-backup/rsnapshot/metadata.xml @@ -0,0 +1,16 @@ + + + + no-herd + + ng.ehahn@gmx.de + Erik Hahn + + proxy maintainer, proxied by yngwin@gentoo.org + + + + yngwin@gentoo.org + Proxy maintainer + + diff --git a/app-backup/rsnapshot/rsnapshot-1.3.1.ebuild b/app-backup/rsnapshot/rsnapshot-1.3.1.ebuild new file mode 100644 index 0000000..1c1ea9d --- /dev/null +++ b/app-backup/rsnapshot/rsnapshot-1.3.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-backup/rsnapshot/rsnapshot-1.3.1.ebuild,v 1.6 2009/01/10 17:08:01 klausman Exp $ + +inherit eutils + +DESCRIPTION="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}"/${P}-cp_al.patch + epatch "${FILESDIR}"/${P}-mount_args.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 ChangeLog docs/* + insinto /usr/share/doc/${PF}/HOWTOs + doins docs/HOWTOs/* + docinto utils + dodoc utils/{README,rsnaptar,*.sh} + docinto utils/rsnapshotdb + dodoc utils/rsnapshotdb/* +} + +pkg_postinst() { + elog + elog "The configuration file: /etc/rsnapshot.conf.default " + elog " has been installed. " + elog "This is a template. " + elog "Copy, or move, the above file to: /etc/rsnapshot.conf " + elog "Note that upgrading will update the template, not real config. " + elog +}