summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@gentoo.org>2006-01-12 18:43:34 +0000
committerGunnar Wrobel <wrobel@gentoo.org>2006-01-12 18:43:34 +0000
commit2fb65ec8df347aa0c9600ef90976ee9097a28062 (patch)
treef59adbcec2c71f914b656bd1572f5bd5179bfe17
parentSynced to CVS tree (diff)
downloadoverlay-2fb65ec8df347aa0c9600ef90976ee9097a28062.tar.gz
overlay-2fb65ec8df347aa0c9600ef90976ee9097a28062.tar.bz2
overlay-2fb65ec8df347aa0c9600ef90976ee9097a28062.zip
mkennedy added my sarab fix to the tree
svn path=/; revision=621
-rw-r--r--app-backup/sarab/ChangeLog20
-rw-r--r--app-backup/sarab/Manifest9
-rw-r--r--app-backup/sarab/files/0.2.2-better-defaults-gentoo.patch33
-rw-r--r--app-backup/sarab/files/0.2.2-fix-rotation.patch12
-rw-r--r--app-backup/sarab/files/0.2.2-test-with-encryption-gentoo.patch68
-rw-r--r--app-backup/sarab/files/README.Gentoo17
-rw-r--r--app-backup/sarab/files/digest-sarab-0.2.21
-rw-r--r--app-backup/sarab/metadata.xml13
-rw-r--r--app-backup/sarab/sarab-0.2.2-r1.ebuild36
9 files changed, 0 insertions, 209 deletions
diff --git a/app-backup/sarab/ChangeLog b/app-backup/sarab/ChangeLog
deleted file mode 100644
index 2157e86..0000000
--- a/app-backup/sarab/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-# ChangeLog for app-backup/sarab
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/sarab/ChangeLog,v 1.3 2005/09/30 19:06:50 mkennedy Exp $
-
- 30 Sep 2005; Matthew Kennedy <mkennedy@gentoo.org> sarab-0.2.2.ebuild:
- Added missing dependency mail-client/mailx; Resolves Bug #106903.
-
- 27 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org>
- +files/0.2.2-better-defaults-gentoo.patch,
- +files/0.2.2-test-with-encryption-gentoo.patch, +files/README.Gentoo,
- sarab-0.2.2.ebuild:
- Better default configuration; Support encryption during create and test;
- Keywording ~amd64, ~x86; Stricter permissions on /etc/sarab/sarab.conf.
-
-*sarab-0.2.2 (25 Jul 2005)
-
- 25 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org> +metadata.xml,
- +sarab-0.2.2.ebuild:
- Initial port. Ebuild contributed by Matthew Kennedy <mkennedy@gentoo.org>.
-
diff --git a/app-backup/sarab/Manifest b/app-backup/sarab/Manifest
deleted file mode 100644
index 0c5f4bc..0000000
--- a/app-backup/sarab/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 83e411936c19f6c20a11f263399b8e86 ChangeLog 889
-MD5 fac42ad5e6199d546ff4f3683fdd4da1 metadata.xml 478
-MD5 141da74709d68f3cfd826712785fbaa6 sarab-0.2.2-r1.ebuild 989
-MD5 d0fa024057272bd7aad055ecc9ee5299 files/0.2.2-test-with-encryption-gentoo.patch 2978
-MD5 1158ff2c096755fee64285dc78eac006 files/0.2.2-better-defaults-gentoo.patch 1274
-MD5 bf4d8827efddcb3c272a36cdd553d431 files/0.2.2-fix-rotation.patch 538
-MD5 19b06302a278f9fdc3dab8e1faabd189 files/digest-sarab-0.2.2 62
-MD5 259987143010b10eb68843ff1da743df files/README.Gentoo 720
-MD5 19b06302a278f9fdc3dab8e1faabd189 files/digest-sarab-0.2.2-r1 62
diff --git a/app-backup/sarab/files/0.2.2-better-defaults-gentoo.patch b/app-backup/sarab/files/0.2.2-better-defaults-gentoo.patch
deleted file mode 100644
index 0e5f22e..0000000
--- a/app-backup/sarab/files/0.2.2-better-defaults-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur sarab.orig/etc/sarab.conf sarab/etc/sarab.conf
---- sarab.orig/etc/sarab.conf 2005-07-27 12:36:09.000000000 -0500
-+++ sarab/etc/sarab.conf 2005-07-27 12:43:52.000000000 -0500
-@@ -56,8 +56,8 @@
- SARAB_VERBOSE="no"
-
- # If non-empty, DAR_ENCRYPTION_OPTIONS contains the cipher options and key to be
--# used to encrypt the backups. See the dar(1) for a description of what is
--# possible.
-+# used to encrypt the backups. See the dar(1) manual for a description of what
-+# is possible.
- # eg. DAR_ENCRYPTION_OPTIONS="--crypto-block 20480 --key blowfish:My_CompleX_key_123"
- DAR_ENCRYPTION_OPTIONS=""
-
-@@ -74,10 +74,10 @@
- BASENAME="$(date +'%m-%d-%Y_%H%M')"
-
- # The location of the DAR executable file
--DAR_BINARY="/usr/local/bin/dar"
-+DAR_BINARY="/usr/bin/dar"
-
- # The location of the statically-compiled DAR executable file
--DAR_STATIC="/usr/local/bin/dar_static"
-+DAR_STATIC="/usr/bin/dar_static"
-
- # The temporary directory name that backups will be created in. This will be created underneath $DESTINATION.
- WORK_DIR=".sarab_temp_workdir"
-@@ -90,4 +90,4 @@
- DAR_COMMAND="$DAR_BINARY --batch $SARAB_ETC/$SARAB_DCF -c $DAR_CREATE --noconf"
-
- # Location and name of temporary log file
--TEMP_LOG="$SARAB_ETC/sarab_temp.log"
-+TEMP_LOG="/var/log/sarab_temp.log"
diff --git a/app-backup/sarab/files/0.2.2-fix-rotation.patch b/app-backup/sarab/files/0.2.2-fix-rotation.patch
deleted file mode 100644
index 3f8987e..0000000
--- a/app-backup/sarab/files/0.2.2-fix-rotation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sarab.orig/sarab.sh sarab/sarab.sh
---- sarab.orig/sarab.sh 2006-01-04 09:45:36.000000000 +0100
-+++ sarab/sarab.sh 2006-01-04 09:49:43.000000000 +0100
-@@ -34,7 +34,7 @@
- function rotate
- {
- lines=$(cat $SARAB_ETC/$ROTATION_SCHEDULE | wc -l)
-- firstline="$(head -n 1 $SARAB_ETC/rotation.schedule)"
-+ firstline="$(head -n 1 $SARAB_ETC/$ROTATION_SCHEDULE)"
-
- # Copy all but the first line back into rotation schedule
- tail -n $(expr $lines - 1) $SARAB_ETC/$ROTATION_SCHEDULE > $SARAB_ETC/rotation.schedule.temp
diff --git a/app-backup/sarab/files/0.2.2-test-with-encryption-gentoo.patch b/app-backup/sarab/files/0.2.2-test-with-encryption-gentoo.patch
deleted file mode 100644
index 3045e90..0000000
--- a/app-backup/sarab/files/0.2.2-test-with-encryption-gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ur sarab.orig/etc/sarab.conf sarab/etc/sarab.conf
---- sarab.orig/etc/sarab.conf 2004-09-08 23:05:59.000000000 -0500
-+++ sarab/etc/sarab.conf 2005-07-27 12:36:09.000000000 -0500
-@@ -55,6 +55,12 @@
- # Default="no"
- SARAB_VERBOSE="no"
-
-+# If non-empty, DAR_ENCRYPTION_OPTIONS contains the cipher options and key to be
-+# used to encrypt the backups. See the dar(1) for a description of what is
-+# possible.
-+# eg. DAR_ENCRYPTION_OPTIONS="--crypto-block 20480 --key blowfish:My_CompleX_key_123"
-+DAR_ENCRYPTION_OPTIONS=""
-+
- ##################################################################
- # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING #
- ##################################################################
-Only in sarab/etc: sarab.conf~
-diff -ur sarab.orig/etc/sarab.dcf sarab/etc/sarab.dcf
---- sarab.orig/etc/sarab.dcf 2004-09-08 23:05:59.000000000 -0500
-+++ sarab/etc/sarab.dcf 2005-07-27 12:23:22.000000000 -0500
-@@ -113,16 +113,6 @@
- --exclude-compression "*.Z"
-
-
--# --key <string>
--# This option will scramble the archive using <string> as the pass-phrase.
--# A scrambled archive can only be read if the same pass-phrase is given.
--# This should not be considered a secure solution, that is why we say
--# "scramble" instead of "encrypt". Still, this option can prevent
--# unexperienced people from looking at your data.
--# Example: (But create your own key!)
--# --key "My_CompleX_key_ADDS_some_Security-Easy_as_123"
--
--
- # Many of the more complex and advanced options of Dar are not listed above.
- # For experienced users, all valid Dar options may be used in this file,
- # except what is noted below.
-@@ -131,3 +121,7 @@
- # NOTE: Do NOT use the options "--create" and "--ref", because SaraB
- # automatically generates these during run-time. If you mistakenly add
- # them to this file, Dar generate an error about duplicate arguments.
-+
-+# Local Variables:
-+# mode: conf
-+# End:
-Only in sarab/etc: sarab.dcf~
-diff -ur sarab.orig/sarab.sh sarab/sarab.sh
---- sarab.orig/sarab.sh 2004-09-08 23:06:16.000000000 -0500
-+++ sarab/sarab.sh 2005-07-27 12:37:17.000000000 -0500
-@@ -211,7 +211,7 @@
- echo -n "Creating backup with DAR..."
- verbose
- verbose "$DAR_COMMAND $REFERENCE_BASENAME"
--$DAR_COMMAND $REFERENCE_BASENAME
-+$DAR_COMMAND $REFERENCE_BASENAME $DAR_ENCRYPTION_OPTIONS
- if [ "$?" != "0" ]; then
- echo "ERROR: Error when executing the backup with DAR. The attempted command was... "
- echo "$DAR_COMMAND $REFERENCE_BASENAME"
-@@ -224,7 +224,7 @@
- echo -n "Testing the archive for errors..."
- verbose
- verbose "$DAR_BINARY -t $DESTINATION/$WORK_DIR/$BASENAME --noconf"
-- $DAR_BINARY -t $DESTINATION/$WORK_DIR/$BASENAME --noconf
-+ $DAR_BINARY -t $DESTINATION/$WORK_DIR/$BASENAME $DAR_ENCRYPTION_OPTIONS --noconf
- if [ "$?" != "0" ]; then
- echo "ERROR: Error when testing the archive. The attempted command was... "
- echo "$DAR_BINARY -t $DESTINATION/$WORK_DIR/$BASENAME --noconf"
-Only in sarab: sarab.sh~
diff --git a/app-backup/sarab/files/README.Gentoo b/app-backup/sarab/files/README.Gentoo
deleted file mode 100644
index 3f99d08..0000000
--- a/app-backup/sarab/files/README.Gentoo
+++ /dev/null
@@ -1,17 +0,0 @@
--*- outline -*- $Id: README.Gentoo,v 1.1 2005/07/27 18:10:37 mkennedy Exp $
-
-Gentoo GNU/Linux specific notes for SaraB
------------------------------------------
-
-This is the README.Gentoo file from /usr/share/doc/@PF@/ directory.
-
- * The Gentoo port includes a patch to support testing of encrypted archives.
- Previously, SaraB supported creating encrypted archives, but the test step
- didn't use the same cipher information and would fail.
-
- * The Gentoo port includes more reasonable pathnames for the example
- configuration.
-
-If you encounter any problems or have suggestions, use http://bugs.gentoo.org.
-Please don't bother the upstream authors unless you are absolutely certain it is
-not Gentoo-related.
diff --git a/app-backup/sarab/files/digest-sarab-0.2.2 b/app-backup/sarab/files/digest-sarab-0.2.2
deleted file mode 100644
index 420c4f4..0000000
--- a/app-backup/sarab/files/digest-sarab-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ecafc5ed6730bb778851e219ef17d4a sarab-0.2.2.tar.gz 22428
diff --git a/app-backup/sarab/metadata.xml b/app-backup/sarab/metadata.xml
deleted file mode 100644
index 8cb4068..0000000
--- a/app-backup/sarab/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
- <email>mkennedy@gentoo.org</email>
- <name>Matthew Kennedy</name>
-</maintainer>
-<longdescription>
-SaraB works with DAR (Disk ARchive) to schedule backups. SaraB provides a
-powerful, automated rotation schedule which allows administrators to create a
-custom rotation that fits the needs of their network.
-</longdescription>
-</pkgmetadata>
diff --git a/app-backup/sarab/sarab-0.2.2-r1.ebuild b/app-backup/sarab/sarab-0.2.2-r1.ebuild
deleted file mode 100644
index 828ca2b..0000000
--- a/app-backup/sarab/sarab-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/sarab/sarab-0.2.2.ebuild,v 1.3 2005/09/30 19:06:50 mkennedy Exp $
-
-inherit eutils
-
-DESCRIPTION="SaraB is a powerful and automated backup scheduling system based on DAR."
-HOMEPAGE="http://sarab.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sarab/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-backup/dar
- mail-client/mailx"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
- unpack ${A}
- epatch ${FILESDIR}/${PV}-test-with-encryption-gentoo.patch || die
- epatch ${FILESDIR}/${PV}-better-defaults-gentoo.patch || die
- epatch ${FILESDIR}/${PV}-fix-rotation.patch || die
-}
-
-src_install() {
- dobin sarab.sh
- insinto /etc/sarab
- doins -r etc/*
- # sarab.conf could contain passphrase information
- fperms 600 /etc/sarab/sarab.conf
- dodoc CHANGELOG FAQ INSTALL LICENSE README
- dodoc ${FILESDIR}/README.Gentoo
-}