OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-May-2005 11:13:13
Branch: HEAD Handle: 2005050710131300
Modified files:
openpkg-src/csp csp.patch csp.spec
Log:
be even more smart and detect if the CSPHOME is the CWD
Summary:
Revision Changes Path
1.4 +12 -7 openpkg-src/csp/csp.patch
1.3 +1 -1 openpkg-src/csp/csp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/csp/csp.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 csp.patch
--- openpkg-src/csp/csp.patch 6 May 2005 19:54:11 -0000 1.3
+++ openpkg-src/csp/csp.patch 7 May 2005 09:13:13 -0000 1.4
@@ -1,6 +1,6 @@
Index: ca/etc/extensions.conf
--- ca/etc/extensions.conf.orig 2001-05-28 13:04:20 +0200
-+++ ca/etc/extensions.conf 2005-05-02 19:42:39 +0200
++++ ca/etc/extensions.conf 2005-05-07 09:35:30 +0200
@@ -67,11 +67,10 @@
[certpolicy]
@@ -16,20 +16,25 @@
Index: csp
--- csp.orig 2001-05-28 13:32:14 +0200
-+++ csp 2005-05-02 19:41:28 +0200
-@@ -1,6 +1,9 @@
++++ csp 2005-05-07 09:36:47 +0200
+@@ -1,9 +1,14 @@
-#!/usr/bin/perl
[EMAIL PROTECTED]@/bin/perl
-use lib './blib/lib';
-+$ENV{OPENSSL} = '@l_prefix@/bin/openssl' if (not defined($ENV{OPENSSL}));
-+$ENV{CSPHOME} = '@l_prefix@/var/csp/ca' if (not defined($ENV{CSPHOME}));
-+
+use lib '@l_prefix@/libexec/csp';
use CSP;
use Getopt::Long;
-@@ -120,6 +123,9 @@
++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
+ {
+@@ -120,6 +125,9 @@
my $home = $ENV{CSPHOME} || 'ca';
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/csp/csp.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 csp.spec
--- openpkg-src/csp/csp.spec 6 May 2005 19:54:11 -0000 1.2
+++ openpkg-src/csp/csp.spec 7 May 2005 09:13:13 -0000 1.3
@@ -33,7 +33,7 @@
Group: Cryptography
License: GPL
Version: 0.26
-Release: 20050506
+Release: 20050507
# list of sources
Source0: ftp://ftp.it.su.se/pub/users/leifj/CSP-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
