Index: CSP.pm
--- CSP.pm.orig	2005-09-22 18:02:58 +0200
+++ CSP.pm	2005-12-01 20:17:55 +0100
@@ -151,7 +151,6 @@
 		my $expr = $1;
 		
 		$expr =~ s/%{([A-Za-z0-9_\.]+)}/\$vars->{$1}/g;
-	        warn "EXPR: \"".$expr."\"\n";
 		my $result = eval $expr;
 		$self->die("$@") if $@;
 		$ctx->push($result);
Index: ca/etc/extensions.conf
--- ca/etc/extensions.conf.orig	2005-09-22 18:12:05 +0200
+++ ca/etc/extensions.conf	2005-12-01 20:17:41 +0100
@@ -75,11 +75,10 @@
 [certpolicy]
 
 policyIdentifier	= 1.1.1.1.1
-## Map this to a real document in your webserver configuration
 CPS.1			= http://ca.example.com/CPS
 userNotice.1		= @notice
 
 [notice]
 
-explicitText="Limited Liability, see http://ca.example.com/CP"
+explicitText            = "Limited Liability, see http://ca.example.com/CP"
 
Index: csp
--- csp.orig	2005-06-02 18:40:20 +0200
+++ csp	2005-12-01 20:17:41 +0100
@@ -1,9 +1,14 @@
-#!/usr/bin/perl
+#!@l_prefix@/bin/perl
 
-use lib './blib/lib';
+use lib '@l_prefix@/libexec/csp';
 
 use CSP;
 use Getopt::Long;
+use Cwd;
+
+$ENV{CSPHOME} = getcwd()                 if (not defined($ENV{CSPHOME}) and -d "./csp");
+$ENV{CSPHOME} = '@l_prefix@/var/csp/ca'  if (not defined($ENV{CSPHOME}));
+$ENV{OPENSSL} = '@l_prefix@/bin/openssl' if (not defined($ENV{OPENSSL}));
 
 sub list_csp
   {
@@ -175,6 +180,9 @@
 
 my $home = $ENV{CSPHOME} || 'ca';
 
+die "Panic: Cannot write to \$CSPHOME \"$home\""
+  unless -w $home;
+
 mkdir "$home/csp",00755 unless -d "$home/csp";
 
 $name eq '--list' and