diff options
author | Matthew Kennedy <mkennedy@gentoo.org> | 2005-07-27 18:10:37 +0000 |
---|---|---|
committer | Matthew Kennedy <mkennedy@gentoo.org> | 2005-07-27 18:10:37 +0000 |
commit | d8bbd11f8a4623ba73f4041edd6815b4bb0d65c6 (patch) | |
tree | 86cef0fe81681b897dbdf98e763fea9bb73424e7 /app-backup/sarab/files | |
parent | Stable on hppa. (diff) | |
download | gentoo-2-d8bbd11f8a4623ba73f4041edd6815b4bb0d65c6.tar.gz gentoo-2-d8bbd11f8a4623ba73f4041edd6815b4bb0d65c6.tar.bz2 gentoo-2-d8bbd11f8a4623ba73f4041edd6815b4bb0d65c6.zip |
.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-backup/sarab/files')
-rw-r--r-- | app-backup/sarab/files/0.2.2-better-defaults-gentoo.patch | 33 | ||||
-rw-r--r-- | app-backup/sarab/files/0.2.2-test-with-encryption-gentoo.patch | 68 | ||||
-rw-r--r-- | app-backup/sarab/files/README.Gentoo | 17 |
3 files changed, 118 insertions, 0 deletions
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 new file mode 100644 index 000000000000..0e5f22ef9c1e --- /dev/null +++ b/app-backup/sarab/files/0.2.2-better-defaults-gentoo.patch @@ -0,0 +1,33 @@ +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-test-with-encryption-gentoo.patch b/app-backup/sarab/files/0.2.2-test-with-encryption-gentoo.patch new file mode 100644 index 000000000000..3045e90cc97c --- /dev/null +++ b/app-backup/sarab/files/0.2.2-test-with-encryption-gentoo.patch @@ -0,0 +1,68 @@ +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 new file mode 100644 index 000000000000..3f99d082643f --- /dev/null +++ b/app-backup/sarab/files/README.Gentoo @@ -0,0 +1,17 @@ +-*- 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. |