diff options
| author | triaxx <triaxx@pkgsrc.org> | 2018-04-07 10:53:34 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2018-04-07 10:53:34 +0000 |
| commit | 4f2dddfb165324741ba90c86a895d583af59188e (patch) | |
| tree | bb550af3d7d2e68adef604f542f35d3795a8243a /security/CSP/patches/patch-CSP.pm | |
| parent | 669822abf5fab465426f8ea4b90fd0bd15ea6206 (diff) | |
| download | pkgsrc-4f2dddfb165324741ba90c86a895d583af59188e.tar.gz | |
Fix broken package due to invalid INSTALLATION_DIRS
Diffstat (limited to 'security/CSP/patches/patch-CSP.pm')
| -rw-r--r-- | security/CSP/patches/patch-CSP.pm | 51 |
1 files changed, 50 insertions, 1 deletions
diff --git a/security/CSP/patches/patch-CSP.pm b/security/CSP/patches/patch-CSP.pm index ab22cf0dd3e..5a50543673d 100644 --- a/security/CSP/patches/patch-CSP.pm +++ b/security/CSP/patches/patch-CSP.pm @@ -1,9 +1,18 @@ -$NetBSD: patch-CSP.pm,v 1.1 2018/02/26 12:32:41 triaxx Exp $ +$NetBSD: patch-CSP.pm,v 1.2 2018/04/07 10:53:34 triaxx Exp $ Fix unescaped braces deprecated since perl 5.22. --- CSP.pm.orig 2007-03-10 22:28:53.000000000 +0000 +++ CSP.pm +@@ -50,7 +50,7 @@ sub new + + my $me = bless { dir=>$dir,name=>$name },$class; + +- open ALIASES,"$dir/etc/aliases.txt"; ++ open ALIASES,"$dir/aliases.txt"; + while (<ALIASES>) + { + chomp; @@ -111,7 +111,7 @@ sub _rewrite my $vars = shift; my $line = shift; @@ -22,3 +31,43 @@ Fix unescaped braces deprecated since perl 5.22. my $result = eval $expr; $self->die("$@") if $@; +@@ -210,7 +210,7 @@ EOW + + ## Default section + $cf->print("[ oids ]\n"); +- $self->addFile($cf,"$self->{dir}/etc/oids.conf"); ++ $self->addFile($cf,"$self->{dir}/oids.conf"); + + $cf->print("\n[ csp ]\n\n"); + my ($k,$v); +@@ -288,7 +288,7 @@ EOC + if ($name) + { + my $econf = "$self->{dir}/csp/$name/extensions.conf"; +- $econf = "$self->{dir}/etc/extensions.conf" unless -f $econf; ++ $econf = "$self->{dir}/extensions.conf" unless -f $econf; + + $self->mppFile($cf,$args,$econf); + } +@@ -296,7 +296,7 @@ EOC + if ($name) + { + my $econf = "$self->{dir}/csp/$name/crl_extensions.conf"; +- $econf = "$self->{dir}/etc/crl_extensions.conf" unless -f $econf; ++ $econf = "$self->{dir}/crl_extensions.conf" unless -f $econf; + + $self->mppFile($cf,$args,$econf); + } +@@ -348,9 +348,9 @@ sub createFiles + + mkdir "$dir/private",00700; + mkdir "$dir/private/keys",00700; +- system('cp','-p',"$self->{dir}/etc/extensions.conf","$dir/extensions.conf"); +- system('cp','-p',"$self->{dir}/etc/crl_extensions.conf","$dir/crl_extensions.conf"); +- system('cp','-rp',"$self->{dir}/etc/public_html","$dir/"); ++ system('cp','-p',"$self->{dir}/extensions.conf","$dir/extensions.conf"); ++ system('cp','-p',"$self->{dir}/crl_extensions.conf","$dir/crl_extensions.conf"); ++ system('cp','-rp',"$self->{dir}/public_html","$dir/"); + } + + sub caDir |