Mon Feb 26 12:32:41 2018 UTC ()
Update to 0.34

* Change file is inconsistent: no information about this release available
* Homepage and repository are dead: tarball reached and archived on
  ftp.NetBSD.org thands to OpenPKG repository
* Configurations files are installed in VARBASE because CSPHOME must be
  writable since CA tree is built in this directory
* Fix deprecated use of unescaped '{'
* Clean Makefile


(triaxx)
diff -r1.24 -r1.25 pkgsrc/security/CSP/Makefile
diff -r1.2 -r1.3 pkgsrc/security/CSP/PLIST
diff -r1.3 -r1.4 pkgsrc/security/CSP/distinfo
diff -r0 -r1.1 pkgsrc/security/CSP/patches/patch-CSP.pm
diff -r1.2 -r1.3 pkgsrc/security/CSP/patches/patch-aa
cvs diff -r1.24 -r1.25 pkgsrc/security/CSP/Makefile (expand / switch to unified diff)

--- pkgsrc/security/CSP/Makefile 2018/02/26 08:00:08 1.24
+++ pkgsrc/security/CSP/Makefile 2018/02/26 12:32:41 1.25
@@ -1,45 +1,34 @@ @@ -1,45 +1,34 @@
1# $NetBSD: Makefile,v 1.24 2018/02/26 08:00:08 triaxx Exp $ 1# $NetBSD: Makefile,v 1.25 2018/02/26 12:32:41 triaxx Exp $
2 2
3DISTNAME= CSP-0.34 3DISTNAME= CSP-0.34
4CATEGORIES= security 4CATEGORIES= security
5#MASTER_SITES= ftp://ftp.su.se/pub/users/leifj/ 5DISTFILES= ${DISTNAME}${EXTRACT_SUFX} cspguide.pdf
6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${CSPGUIDE} 6EXTRACT_ONLY= ${DISTFILES:N*.pdf}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= http://devel.it.su.se/pub/jsp/polopoly.jsp?d=1026&a=3290 
10COMMENT= Simple PKI Toolkit 9COMMENT= Simple PKI Toolkit
11 10
12DEPENDS+= p5-Date-Calc>=5.4:../../devel/p5-Date-Calc 11DEPENDS+= p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
13DEPENDS+= p5-IPC-Run>=0.79:../../devel/p5-IPC-Run 12DEPENDS+= p5-IPC-Run>=0.79:../../devel/p5-IPC-Run
14DEPENDS+= p5-Term-Prompt>=1.03:../../devel/p5-Term-Prompt 13DEPENDS+= p5-Term-Prompt>=1.03:../../devel/p5-Term-Prompt
15 14
16USE_TOOLS+= pax 15USE_TOOLS+= pax
17BUILD_DEFS+= VARBASE 16BUILD_DEFS+= VARBASE
 17OWN_DIRS= ${VARBASE}/csp
18 18
19CSPGUIDE= cspguide.pdf 19INSTALLATION_DIRS= ${VARBASE}/csp share/doc/csp
20#SITES.${CSPGUIDE}= http://devel.it.su.se/content/1/c4/32/90/ 
21EXTRACT_ONLY= ${DISTFILES:N*.pdf} 
22 
23PERL5_PACKLIST= auto/CSP/.packlist 
24 
25CSPHOME= ${VARBASE}/csp 
26OPENSSLBIN= ${BUILDLINK_PREFIX.openssl}/bin/openssl 
27OWN_DIRS= ${CSPHOME} 
28INSTALLATION_DIRS= share/doc/csp 
29 
30BUILD_DEFS+= CSPHOME 
31 20
32SUBST_CLASSES+= csp 21SUBST_CLASSES+= csp
33SUBST_FILES.csp= csp 22SUBST_FILES.csp= csp
34SUBST_SED.csp= -e s,@@CSPHOME@@,${CSPHOME}, 23SUBST_SED.csp= -e s,@CSPHOME@,${VARBASE}/csp,
35SUBST_SED.csp+= -e s,@@OPENSSL@@,${OPENSSLBIN}, 24SUBST_SED.csp+= -e s,@OPENSSL@,${BUILDLINK_PREFIX.openssl}/bin/openssl,
36SUBST_STAGE.csp= post-patch 25SUBST_STAGE.csp= pre-install
37 26
38post-install: 27post-install:
39 ${INSTALL_DATA_DIR} ${DESTDIR}${CSPHOME} 28 ${INSTALL_DATA_DIR} ${DESTDIR}${CSPHOME}
40 cd ${WRKSRC}/ca && ${FIND} . -type f | pax -rw ${DESTDIR}${CSPHOME} 29 cd ${WRKSRC}/ca && ${FIND} . -type f | pax -rw ${DESTDIR}${VARBASE}/csp
41 ${INSTALL_DATA} ${DISTDIR}/${CSPGUIDE} ${DESTDIR}${PREFIX}/share/doc/csp 30 ${INSTALL_DATA} ${DISTDIR}/cspguide.pdf ${DESTDIR}${PREFIX}/share/doc/csp
42 31
43.include "../../lang/perl5/module.mk" 32.include "../../lang/perl5/module.mk"
44.include "../../security/openssl/buildlink3.mk" 33.include "../../security/openssl/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/security/CSP/PLIST (expand / switch to unified diff)

--- pkgsrc/security/CSP/PLIST 2018/02/26 08:00:08 1.2
+++ pkgsrc/security/CSP/PLIST 2018/02/26 12:32:41 1.3
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2018/02/26 08:00:08 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/02/26 12:32:41 triaxx Exp $
2${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod 
3${PERL5_SUB_INSTALLVENDORLIB}/CSP.pm 2${PERL5_SUB_INSTALLVENDORLIB}/CSP.pm
4${PERL5_SUB_INSTALLVENDORLIB}/auto/CSP/autosplit.ix 3${PERL5_SUB_INSTALLVENDORLIB}/auto/CSP/autosplit.ix
5${PERL5_SUB_INSTALLVENDORARCH}/auto/CSP/.packlist 4${PERL5_SUB_INSTALLVENDORARCH}/auto/CSP/.packlist
6${PERL5_SUB_INSTALLVENDORBIN}/csp 5${PERL5_SUB_INSTALLVENDORBIN}/csp
7${PERL5_SUB_INSTALLVENDORMAN3DIR}/CSP.3 6${PERL5_SUB_INSTALLVENDORMAN3DIR}/CSP.3
8share/doc/csp/cspguide.pdf 7share/doc/csp/cspguide.pdf
9var/csp/etc/aliases.txt 8var/csp/etc/aliases.txt
10var/csp/etc/crl_extensions.conf 9var/csp/etc/crl_extensions.conf
11var/csp/etc/extensions.conf 10var/csp/etc/extensions.conf
12var/csp/etc/oids.conf 11var/csp/etc/oids.conf
13var/csp/etc/public_html/certs/cert.html.mpp 12var/csp/etc/public_html/certs/cert.html.mpp
14var/csp/etc/public_html/certs/expired.html.mpp 13var/csp/etc/public_html/certs/expired.html.mpp
15var/csp/etc/public_html/certs/index.html.mpp 14var/csp/etc/public_html/certs/index.html.mpp
cvs diff -r1.3 -r1.4 pkgsrc/security/CSP/distinfo (expand / switch to unified diff)

--- pkgsrc/security/CSP/distinfo 2018/02/26 08:00:08 1.3
+++ pkgsrc/security/CSP/distinfo 2018/02/26 12:32:41 1.4
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.3 2018/02/26 08:00:08 triaxx Exp $ 1$NetBSD: distinfo,v 1.4 2018/02/26 12:32:41 triaxx Exp $
2 2
3SHA1 (CSP-0.34.tar.gz) = 13440461ffc119421a6a97f62d94d35a38fde2e7 3SHA1 (CSP-0.34.tar.gz) = 13440461ffc119421a6a97f62d94d35a38fde2e7
4RMD160 (CSP-0.34.tar.gz) = 68a7e3ad1ccac9628aaffd5331e2877f29e2cb38 4RMD160 (CSP-0.34.tar.gz) = 68a7e3ad1ccac9628aaffd5331e2877f29e2cb38
5SHA512 (CSP-0.34.tar.gz) = 3984a6b6acfca5430ce0b135f5d0e9c298165e9aebd9d6fe5b847926dcb7d2d7164331983bd651ae426d711db8f6ce9e3667254352198f7b52ccd03290f17785 5SHA512 (CSP-0.34.tar.gz) = 3984a6b6acfca5430ce0b135f5d0e9c298165e9aebd9d6fe5b847926dcb7d2d7164331983bd651ae426d711db8f6ce9e3667254352198f7b52ccd03290f17785
6Size (CSP-0.34.tar.gz) = 18110 bytes 6Size (CSP-0.34.tar.gz) = 18110 bytes
7SHA1 (cspguide.pdf) = f527519553d7c64f625210a74435c413cd470838 7SHA1 (cspguide.pdf) = f527519553d7c64f625210a74435c413cd470838
8RMD160 (cspguide.pdf) = d4727fb6e4e44ad8c45d0749374843b38a340af9 8RMD160 (cspguide.pdf) = d4727fb6e4e44ad8c45d0749374843b38a340af9
9SHA512 (cspguide.pdf) = 2927a3d6b02e19e1acbd2230b4577d71151557cac22c59a7eebfab0d726c4deaf2826fe920065197bcd1271d37223a70ffd59fe3c3e37b93a6d8c799b5250b33 9SHA512 (cspguide.pdf) = 2927a3d6b02e19e1acbd2230b4577d71151557cac22c59a7eebfab0d726c4deaf2826fe920065197bcd1271d37223a70ffd59fe3c3e37b93a6d8c799b5250b33
10Size (cspguide.pdf) = 152084 bytes 10Size (cspguide.pdf) = 152084 bytes
11SHA1 (patch-aa) = c97840d43189a14361646b79d826162bf8d22bc3 11SHA1 (patch-aa) = 3d85a927385a3bf21d238f422695e759da11aaa9
 12SHA1 (patch-CSP.pm) = c573643c23ac60d6aa65a2aab1d0b7dab1782c05
File Added: pkgsrc/security/CSP/patches/patch-CSP.pm
$NetBSD: patch-CSP.pm,v 1.1 2018/02/26 12:32:41 triaxx Exp $

Fix unescaped braces deprecated since perl 5.22.

--- CSP.pm.orig	2007-03-10 22:28:53.000000000 +0000
+++ CSP.pm
@@ -111,7 +111,7 @@ sub _rewrite
     my $vars = shift;
     my $line = shift;
 
-    while ($line =~ s/%{([a-zA-Z0-9_\.]+)}/$vars->{$1}/eg) { }
+    while ($line =~ s/%\{([a-zA-Z0-9_\.]+)\}/$vars->{$1}/eg) { }
     $line;
   }
 
@@ -150,7 +150,7 @@ sub mppFile
 	      {
 		my $expr = $1;
 		
-		$expr =~ s/%{([A-Za-z0-9_\.]+)}/"\$vars->{\"$1\"}"/eg;
+		$expr =~ s/%\{([A-Za-z0-9_\.]+)\}/"\$vars->{\"$1\"}"/eg;
 		
 		my $result = eval $expr;
 		$self->die("$@") if $@;
cvs diff -r1.2 -r1.3 pkgsrc/security/CSP/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/CSP/patches/patch-aa 2018/02/26 08:00:08 1.2
+++ pkgsrc/security/CSP/patches/patch-aa 2018/02/26 12:32:41 1.3
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-aa,v 1.2 2018/02/26 08:00:08 triaxx Exp $ 1$NetBSD: patch-aa,v 1.3 2018/02/26 12:32:41 triaxx Exp $
2 2
3Add variables for SUBST. 3Add variables for SUBST.
4 4
5--- csp.orig 2005-06-02 18:40:20.000000000 +0200 5--- csp.orig 2007-03-10 22:28:34.000000000 +0000
6+++ csp 6+++ csp
7@@ -167,14 +167,16 @@ die $usage{_nocmd_} unless @ARGV > 0; 7@@ -167,14 +167,16 @@ die $usage{_nocmd_} unless @ARGV > 0;
8  8
9 my $name = shift @ARGV; 9 my $name = shift @ARGV;
10  10
11+my $home = $ENV{CSPHOME} || '@@CSPHOME@@'; 11+my $home = $ENV{CSPHOME} || '@CSPHOME@';
12+ 12+
13 warn "Warning: \$CSPHOME unset. This may prevent CSP from working properly.\n" 13 warn "Warning: \$CSPHOME unset. This may prevent CSP from working properly.\n"
14- unless $ENV{CSPHOME}; 14- unless $ENV{CSPHOME};
15+ unless -d $home; 15+ unless -d $home;
16+ 16+
17+$ENV{OPENSSL} = '@@OPENSSL@@' unless defined($ENV{OPENSSL}); 17+$ENV{OPENSSL} = '@OPENSSL@' unless defined($ENV{OPENSSL});
18  18
19 die "Panic: \$OPENSSL does not point to a executable.\n" 19 die "Panic: \$OPENSSL does not point to a executable.\n"
20 unless -x $ENV{OPENSSL}; 20 unless -x $ENV{OPENSSL};
21  21
22-my $home = $ENV{CSPHOME} || 'ca'; 22-my $home = $ENV{CSPHOME} || 'ca';
23- 23-
24 mkdir "$home/csp",00755 unless -d "$home/csp"; 24 mkdir "$home/csp",00755 unless -d "$home/csp";
25  25
26 $name eq '--list' and 26 $name eq '--list' and