From fcd86832f17fc8c2910be10425e92b042768f0de Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Tue, 11 Oct 2005 23:21:32 +0000
Subject: [PATCH] added subversion's "Id" and "Revision" tags to most files
 removed manual extraction of revision from cbox-build.sh

---
 cbox-tree.d/etc/cryptobox/revision            |  1 +
 cbox-tree.d/etc/issue                         |  1 +
 cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh  |  1 +
 .../usr/lib/cryptobox/check_smb_idle.sh       |  1 +
 cbox-tree.d/usr/lib/cryptobox/chroot-start.sh |  1 +
 .../usr/lib/cryptobox/configure-cryptobox.sh  |  1 +
 .../usr/lib/cryptobox/devel-features.sh       |  1 +
 cbox-tree.d/usr/lib/cryptobox/firewall.sh     |  1 +
 .../usr/lib/cryptobox/make_stunnel_cert.sh    |  1 +
 cbox-tree.d/usr/share/cryptobox/lang/README   |  2 ++
 cbox-tree.d/usr/share/cryptobox/lang/TODO     |  8 ++++++--
 cbox-tree.d/usr/share/cryptobox/lang/de.hdf   |  2 ++
 cbox-tree.d/usr/share/cryptobox/lang/en.hdf   |  2 ++
 cbox-tree.d/usr/share/cryptobox/lang/si.hdf   |  2 ++
 .../share/cryptobox/templates/config_form.cs  |  2 ++
 .../usr/share/cryptobox/templates/doc.cs      |  2 ++
 .../usr/share/cryptobox/templates/empty.cs    |  2 ++
 .../usr/share/cryptobox/templates/error.cs    |  2 ++
 .../usr/share/cryptobox/templates/footer.cs   |  4 ++++
 .../usr/share/cryptobox/templates/header.cs   |  2 ++
 .../share/cryptobox/templates/init_form.cs    |  2 ++
 .../usr/share/cryptobox/templates/macros.cs   |  2 ++
 .../usr/share/cryptobox/templates/main.cs     |  2 ++
 .../share/cryptobox/templates/mount_form.cs   |  2 ++
 .../usr/share/cryptobox/templates/nav.cs      |  2 ++
 .../usr/share/cryptobox/templates/show_log.cs |  2 ++
 .../cryptobox/templates/shutdown_form.cs      |  2 ++
 .../usr/share/cryptobox/templates/status.cs   |  2 ++
 .../share/cryptobox/templates/umount_form.cs  |  2 ++
 cbox-tree.d/var/www/cgi-bin/cryptobox.pl      |  1 +
 etc-defaults.d/dfs-cbox.conf                  |  2 --
 scripts/cbox-build.sh                         | 20 ++-----------------
 scripts/cbox-dev.sh                           |  1 +
 33 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 cbox-tree.d/etc/cryptobox/revision
 create mode 100644 cbox-tree.d/etc/issue

diff --git a/cbox-tree.d/etc/cryptobox/revision b/cbox-tree.d/etc/cryptobox/revision
new file mode 100644
index 0000000..31cc7b9
--- /dev/null
+++ b/cbox-tree.d/etc/cryptobox/revision
@@ -0,0 +1 @@
+$Revision$
diff --git a/cbox-tree.d/etc/issue b/cbox-tree.d/etc/issue
new file mode 100644
index 0000000..b7ee20f
--- /dev/null
+++ b/cbox-tree.d/etc/issue
@@ -0,0 +1 @@
+CryptoBox r$Revision$
diff --git a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
index 1f87e02..28fb29d 100755
--- a/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/cbox-manage.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # this script does EVERYTHING
 # all other scripts are only frontends :)
diff --git a/cbox-tree.d/usr/lib/cryptobox/check_smb_idle.sh b/cbox-tree.d/usr/lib/cryptobox/check_smb_idle.sh
index 83dec84..ec596ef 100755
--- a/cbox-tree.d/usr/lib/cryptobox/check_smb_idle.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/check_smb_idle.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # a simple script to check, if there was no smb traffic for the specified
 # number of minutes - then it unmounts the crypto partition
diff --git a/cbox-tree.d/usr/lib/cryptobox/chroot-start.sh b/cbox-tree.d/usr/lib/cryptobox/chroot-start.sh
index 0d28182..d89a46e 100755
--- a/cbox-tree.d/usr/lib/cryptobox/chroot-start.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/chroot-start.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # FOR DEVELOPMENT ONLY!
 #
diff --git a/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh b/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh
index aff7e49..4eea353 100755
--- a/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/configure-cryptobox.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # this script is part of the building process of the cryptobox
 # the "normal" action is necessary for every cryptobox (development & release)
diff --git a/cbox-tree.d/usr/lib/cryptobox/devel-features.sh b/cbox-tree.d/usr/lib/cryptobox/devel-features.sh
index 6d57843..7fc2d66 100755
--- a/cbox-tree.d/usr/lib/cryptobox/devel-features.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/devel-features.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # this script is part of the boot process of a developer's cryptobox
 #
diff --git a/cbox-tree.d/usr/lib/cryptobox/firewall.sh b/cbox-tree.d/usr/lib/cryptobox/firewall.sh
index 29f97c5..9716778 100755
--- a/cbox-tree.d/usr/lib/cryptobox/firewall.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/firewall.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # set up the firewall of the cryptobox
 #
diff --git a/cbox-tree.d/usr/lib/cryptobox/make_stunnel_cert.sh b/cbox-tree.d/usr/lib/cryptobox/make_stunnel_cert.sh
index 6792c81..53f038e 100755
--- a/cbox-tree.d/usr/lib/cryptobox/make_stunnel_cert.sh
+++ b/cbox-tree.d/usr/lib/cryptobox/make_stunnel_cert.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # this script creates the stunnel certificate for https
 #
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/README b/cbox-tree.d/usr/share/cryptobox/lang/README
index 9296fd1..8edf0b0 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/README
+++ b/cbox-tree.d/usr/share/cryptobox/lang/README
@@ -1,3 +1,5 @@
+$Id$
+
 You may want to translate the CryptoBox into another language?
 Most welcome!
 
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/TODO b/cbox-tree.d/usr/share/cryptobox/lang/TODO
index c97767d..8afaa30 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/TODO
+++ b/cbox-tree.d/usr/share/cryptobox/lang/TODO
@@ -1,7 +1,11 @@
+$Id$
+
 Here are some minor fixes that have to be done. Thanks a lot for your
 help!
 
-slovenian:
+
+################################ slovenian ##################################
+
 - SuccessMessage.InitRunning contains only the first sentence
 - SuccessMessage.ReBoot: add a hint for automatic redirection (3rd sentence)
 - EmptyCryptoPassword: change 'Text' accordingly to English string.
@@ -9,4 +13,4 @@ slovenian:
 Below are some smaller changes in English sentences. Someone may change it accordingly.
 - MountFailed: add 'Pleasy try again' to the end of the string.
 - UmountFailed: changed 'Also close all unclean programs' to 'Close all unclean programs'.
-- InitRunning: changed 'You may configure it now. You may activate the encrypted filesystem in a few minutes.' to 'You may configure it now and activate the encrypted filesystem in a few minutes.'
\ No newline at end of file
+- InitRunning: changed 'You may configure it now. You may activate the encrypted filesystem in a few minutes.' to 'You may configure it now and activate the encrypted filesystem in a few minutes.'
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/de.hdf b/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
index be285bc..8bba0c3 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
+++ b/cbox-tree.d/usr/share/cryptobox/lang/de.hdf
@@ -2,6 +2,8 @@ Lang {
 
 	Name	= deutsch
 
+	Status	= $Id$
+
 	Title {
 		Top			= Die CryptoBox
 		Slogan		= ... und 1984 war gestern!
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/en.hdf b/cbox-tree.d/usr/share/cryptobox/lang/en.hdf
index 5d06afd..5236178 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/en.hdf
+++ b/cbox-tree.d/usr/share/cryptobox/lang/en.hdf
@@ -2,6 +2,8 @@ Lang {
 
 	Name	= english
 
+	Status	= $Id$
+
 	Title {
 		Top			= The CryptoBox
 		Slogan		= Privacy for the rest of us.
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/si.hdf b/cbox-tree.d/usr/share/cryptobox/lang/si.hdf
index 64ea81b..2ec7a35 100644
--- a/cbox-tree.d/usr/share/cryptobox/lang/si.hdf
+++ b/cbox-tree.d/usr/share/cryptobox/lang/si.hdf
@@ -2,6 +2,8 @@ Lang {
 
 	Name	= slovenščina
 
+	Status	= $Id$
+
 	Title {
 		Top			= The CryptoBox
 		Slogan		= Privatnost v vsako vas!
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
index 8c632ce..155b6ec 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/config_form.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <div id="config">
     <h1><?cs var:Lang.Title.Config ?></h1>
 
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/doc.cs b/cbox-tree.d/usr/share/cryptobox/templates/doc.cs
index 6e499a8..20146db 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/doc.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/doc.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <div id="doc">
 
 <?cs include:Settings.DocDir + '/' + Settings.DocLang + '/' + Data.Doc.Page + '.html' ?>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/empty.cs b/cbox-tree.d/usr/share/cryptobox/templates/empty.cs
index fa14cb9..8db0381 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/empty.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/empty.cs
@@ -1 +1,3 @@
+<!-- $Id$ -->
+
 <!-- what else would you expect here? -->
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/error.cs b/cbox-tree.d/usr/share/cryptobox/templates/error.cs
index 6360103..ac56d9a 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/error.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/error.cs
@@ -1 +1,3 @@
+<!-- $Id$ -->
+
 <?cs call:error(Data.Error) ?>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/footer.cs b/cbox-tree.d/usr/share/cryptobox/templates/footer.cs
index a29e82f..765dd29 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/footer.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/footer.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 	<?cs if:Data.Redirect ?>
 		<p class="warning"><a href="<?cs if:Data.Redirect.URL ?><?cs var:Data.Redirect.URL ?><?cs else ?><?cs call:getSelfURL('action=' + Data.Redirect.Action, '') ?><?cs /if ?>"><?cs var:Lang.Text.RedirectNote ?></a></p>
 	<?cs /if ?>
@@ -23,5 +25,7 @@ Data.Status.IP=<?cs var:Data.Status.IP ?>
 Data.Status.Mounted=<?cs var:Data.Status.Mounted ?>
 CBOX-STATUS-end -->
 
+<!-- $Revision$ -->
+
 </body>
 </html>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/header.cs b/cbox-tree.d/usr/share/cryptobox/templates/header.cs
index 34575da..9410962 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/header.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/header.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
index 7ef5809..bcd0028 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/init_form.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <h1><?cs var:Lang.Title.Init ?></h1>
 
 <div class="init">
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/macros.cs b/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
index 3c49f72..c58624f 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/macros.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <?cs def:warning(warnname) ?><?cs
     each:item = Lang.WarningMessage ?><?cs 
       if:(name(item) == warnname)
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/main.cs b/cbox-tree.d/usr/share/cryptobox/templates/main.cs
index babbcb9..d93cc61 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/main.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/main.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <?cs include:Settings.TemplateDir + '/macros.cs' ?>
 <?cs include:Settings.TemplateDir + '/header.cs' ?>
 
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
index 98741ea..42b87d3 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/mount_form.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <h1><?cs var:Lang.Title.Mount ?></h1>
 
 <div align="center">
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/nav.cs b/cbox-tree.d/usr/share/cryptobox/templates/nav.cs
index 1887b1a..1740e90 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/nav.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/nav.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <!-- mounting possible? -->
 <?cs if:((Data.Status.Config == 1) && (Data.Status.InitRunning == 0)) ?>
     <?cs if:(Data.Status.Mounted == 1) ?>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/show_log.cs b/cbox-tree.d/usr/share/cryptobox/templates/show_log.cs
index fb0764d..3544b63 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/show_log.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/show_log.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <div id="log">
 
 	<h1><?cs var:Lang.Title.Log ?></h1>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
index 83b7af9..3a27662 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/shutdown_form.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <h1><?cs var:Lang.Title.ShutDown ?></h1>
 
 <div align="center">
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/status.cs b/cbox-tree.d/usr/share/cryptobox/templates/status.cs
index a2e8439..00e2ab4 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/status.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/status.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <h1><?cs var:Lang.Title.Status ?></h1>
 <p><?cs if:(Data.Status.Mounted == 1) ?><?cs var:Lang.Text.CryptoIsActive ?>
 <?cs else ?><?cs var:Lang.Text.CryptoIsDown ?><?cs /if ?></p>
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
index 8365374..f11b963 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/umount_form.cs
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
 <h1><?cs var:Lang.Title.Umount ?></h1>
 
 <div align="center">
diff --git a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
index e2f08a3..a7bc184 100755
--- a/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
+++ b/cbox-tree.d/var/www/cgi-bin/cryptobox.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# $Id$
 #
 # web interface of the CryptoBox
 #
diff --git a/etc-defaults.d/dfs-cbox.conf b/etc-defaults.d/dfs-cbox.conf
index 17e14f3..b6ce29b 100644
--- a/etc-defaults.d/dfs-cbox.conf
+++ b/etc-defaults.d/dfs-cbox.conf
@@ -214,8 +214,6 @@ arch = amd64
 
 # /etc/modules =
 
-/etc/issue = This is the CryptoBox!
-
 /etc/profile = export TERM=vt100
 
 ######################################################################
diff --git a/scripts/cbox-build.sh b/scripts/cbox-build.sh
index 4e9d35e..e12f6a5 100755
--- a/scripts/cbox-build.sh
+++ b/scripts/cbox-build.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # managing our work at the cryptobox
 #
@@ -88,19 +89,9 @@ function configure_cb()
 
 	echo "Copying files to the box ..."
 		[ -e "$TMP_DIR" ] && rm -rf "$TMP_DIR"
-		cp -dr "$TEMPLATE_DIR/." "$TMP_DIR"
-		rm -rf `find "$TMP_DIR" -type d -name ".svn"`
-		cp -dr "$TMP_DIR/." "$IMAGE_DIR"
-		rm -rf "$TMP_DIR"
+		svn export --force "$TEMPLATE_DIR/." "$IMAGE_DIR"
 	
 	echo "Configuring the cryptobox ..."
-		# "harden" removes /etc/issue ...
-		if [ -e "$IMAGE_DIR/etc/issue" ]
-		  then	sed -i "s/^Version:/Revision:/" "$IMAGE_DIR/etc/issue"
-				sed -i "s/^Revision:.*/Revision: $(fetch_revision)/" "$IMAGE_DIR/etc/issue"
-		  else	echo "Revision: $(fetch_revision)" >"$IMAGE_DIR/etc/issue"
-		 fi
-		fetch_revision >"$IMAGE_DIR/etc/cryptobox/revision"
 		chroot "$IMAGE_DIR" "$CHROOT_START" /usr/lib/cryptobox/configure-cryptobox.sh normal
 	
 	# source local configure scripts
@@ -115,13 +106,6 @@ function configure_cb()
 }
 
 
-function fetch_revision()
-{
-	svn -R info 2>&1 | grep ^Revision| cut -f2 -d " " | sort | tail -1 \
-		|| echo "unknown release"
-}
-
-
 function blanknburn_cdrw()
 {
 	cdrecord -v dev=$CDWRITER blank=fast
diff --git a/scripts/cbox-dev.sh b/scripts/cbox-dev.sh
index 35b8de3..c00dd26 100755
--- a/scripts/cbox-dev.sh
+++ b/scripts/cbox-dev.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $Id$
 #
 # managing our work at the cryptobox
 #