.

(Portage version: 2.0.51.22-r1)

6 files changed, 142 insertions, 5 deletions

diff --git a/app-backup/sarab/ChangeLog b/app-backup/sarab/ChangeLog
index 2c4a08a7ebd9..9a6f1a0dffbd 100644
--- a/app-backup/sarab/ChangeLog
+++ b/app-backup/sarab/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2005/07/25 22:23:31 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/sarab/ChangeLog,v 1.2 2005/07/27 18:10:37 mkennedy Exp $
+
+  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)
 
diff --git a/app-backup/sarab/Manifest b/app-backup/sarab/Manifest
index 251b313bb1b8..2684f0acc46c 100644
--- a/app-backup/sarab/Manifest
+++ b/app-backup/sarab/Manifest
@@ -1,4 +1,7 @@
-MD5 fac42ad5e6199d546ff4f3683fdd4da1 metadata.xml 478
-MD5 9c975922e397640087922314d97809fd sarab-0.2.2.ebuild 654
 MD5 f60f4c1bac98074223fda049c9d7d192 ChangeLog 405
+MD5 fac42ad5e6199d546ff4f3683fdd4da1 metadata.xml 478
+MD5 12ac6a2847d697e5b40f3903f64ac222 sarab-0.2.2.ebuild 918
+MD5 0d4f349396db0315063d70f90c44b6cc files/README.Gentoo 720
 MD5 19b06302a278f9fdc3dab8e1faabd189 files/digest-sarab-0.2.2 62
+MD5 d0fa024057272bd7aad055ecc9ee5299 files/0.2.2-test-with-encryption-gentoo.patch 2978
+MD5 1158ff2c096755fee64285dc78eac006 files/0.2.2-better-defaults-gentoo.patch 1274
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.
diff --git a/app-backup/sarab/sarab-0.2.2.ebuild b/app-backup/sarab/sarab-0.2.2.ebuild
index 7263d3f3217e..692406308046 100644
--- a/app-backup/sarab/sarab-0.2.2.ebuild
+++ b/app-backup/sarab/sarab-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/07/25 22:23:31 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/sarab/sarab-0.2.2.ebuild,v 1.2 2005/07/27 18:10:37 mkennedy Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://sarab.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sarab/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"					# work in progress
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -17,9 +17,18 @@ RDEPEND="app-backup/dar"
 
 S=${WORKDIR}/${PN}
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-test-with-encryption-gentoo.patch || die
+	epatch ${FILESDIR}/${PV}-better-defaults-gentoo.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
 }