Hi.
I just downloaded openca-0.9.2-RC4 and found my bindir patch a little off.
Here's a new one (attached). Wouldn't it be more consistent to do it like
this?
Cheers.
--
Regards // Oden Eriksson
diff -Naur openca-0.9.2-RC4/src/common/etc/token.xml.in openca-0.9.2-RC4.oden/src/common/etc/token.xml.in
--- openca-0.9.2-RC4/src/common/etc/token.xml.in 2004-04-16 17:32:05.000000000 +0200
+++ openca-0.9.2-RC4.oden/src/common/etc/token.xml.in 2004-04-17 13:22:40.950068892 +0200
@@ -41,7 +41,7 @@
</option>
<option>
<name>OPENCA_SV</name>
- <value>@EXEC_PREFIX@/bin/openca-sv</value>
+ <value>@bindir@/openca-sv</value>
</option>
<option>
<name>TMPDIR</name>
@@ -78,7 +78,7 @@
</option>
<option>
<name>OPENCA_SV</name>
- <value>@EXEC_PREFIX@/bin/openca-sv</value>
+ <value>@bindir@/openca-sv</value>
</option>
<option>
<name>TMPDIR</name>
@@ -115,7 +115,7 @@
</option>
<option>
<name>OPENCA_SV</name>
- <value>@EXEC_PREFIX@/bin/openca-sv</value>
+ <value>@bindir@/openca-sv</value>
</option>
<option>
<name>TMPDIR</name>
@@ -162,7 +162,7 @@
</option>
<option>
<name>OPENCA_SV</name>
- <value>@EXEC_PREFIX@/bin/openca-sv</value>
+ <value>@bindir@/openca-sv</value>
</option>
<option>
<name>TMPDIR</name>
@@ -207,7 +207,7 @@
</option>
<option>
<name>OPENCA_SV</name>
- <value>@EXEC_PREFIX@/bin/openca-sv</value>
+ <value>@bindir@/openca-sv</value>
</option>
<option>
<name>TMPDIR</name>
diff -Naur openca-0.9.2-RC4/src/scripts/openca-newcert.in openca-0.9.2-RC4.oden/src/scripts/openca-newcert.in
--- openca-0.9.2-RC4/src/scripts/openca-newcert.in 2004-04-16 17:32:04.000000000 +0200
+++ openca-0.9.2-RC4.oden/src/scripts/openca-newcert.in 2004-04-17 13:24:54.234936911 +0200
@@ -58,7 +58,7 @@
echo
# echo "Importing request into DB ... \c"
-# [EMAIL PROTECTED]@/bin/openca-addreq ${req} ARCHIVIED_REQUEST ${ca}`;
+# [EMAIL PROTECTED]@/openca-addreq ${req} ARCHIVIED_REQUEST ${ca}`;
# echo "Done."
# echo
@@ -123,7 +123,7 @@
## "Importing certificate into DB ... "
[EMAIL PROTECTED]@/bin/openca-addcert $nser $ca`;
[EMAIL PROTECTED]@/openca-addcert $nser $ca`;
echo "Cleaning item files ... \c"
rm $ca/tmp/* 2>&1 >/dev/null
diff -Naur openca-0.9.2-RC4/src/web-interfaces/node/node.conf.in openca-0.9.2-RC4.oden/src/web-interfaces/node/node.conf.in
--- openca-0.9.2-RC4/src/web-interfaces/node/node.conf.in 2004-04-16 17:32:03.000000000 +0200
+++ openca-0.9.2-RC4.oden/src/web-interfaces/node/node.conf.in 2004-04-17 13:25:44.881625047 +0200
@@ -15,7 +15,7 @@
sslindex "@var_prefix@/crypto/index.txt"
sslserial "@var_prefix@/crypto/serial"
OCSPindex "@var_prefix@/crypto/ocsp_index.txt"
-OpenCA_SV_Path "@EXEC_PREFIX@/bin/openca-sv"
+OpenCA_SV_Path "@bindir@/openca-sv"
MakePath "@MAKE@"
## General Section
diff -Naur openca-0.9.2-RC4/src/web-interfaces/pub/public.conf.in openca-0.9.2-RC4.oden/src/web-interfaces/pub/public.conf.in
--- openca-0.9.2-RC4/src/web-interfaces/pub/public.conf.in 2004-04-16 17:32:03.000000000 +0200
+++ openca-0.9.2-RC4.oden/src/web-interfaces/pub/public.conf.in 2004-04-17 13:26:46.060165400 +0200
@@ -41,7 +41,7 @@
openssl "@OPENSSL@"
opensslEngine "@openssl_engine@"
sslconfig "@etc_prefix@/openssl/openssl.cnf"
-scepPath "@prefix@/bin/openca-scep"
+scepPath "@bindir@/openca-scep"
tempdir "@var_prefix@/tmp"
BP_DIR "@var_prefix@/batch"
diff -Naur openca-0.9.2-RC4/src/web-interfaces/scep/scep.conf.in openca-0.9.2-RC4.oden/src/web-interfaces/scep/scep.conf.in
--- openca-0.9.2-RC4/src/web-interfaces/scep/scep.conf.in 2004-04-16 17:32:03.000000000 +0200
+++ openca-0.9.2-RC4.oden/src/web-interfaces/scep/scep.conf.in 2004-04-17 13:27:13.630549276 +0200
@@ -39,7 +39,7 @@
openssl "@OPENSSL@"
opensslEngine "@openssl_engine@"
sslconfig "@etc_prefix@/openssl/openssl.cnf"
-scepPath "@prefix@/bin/openca-scep"
+scepPath "@bindir@/openca-scep"
tempdir "@var_prefix@/tmp"
crlfile "@var_prefix@/crypto/crls/cacrl.crl"
