[pkgsrc/trunk]: pkgsrc/security/CSP Fix broken package due to invalid INSTALL...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/security/CSP Fix broken package due to invalid INSTALL...
From: triaxx <triaxx%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 09:05:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6bcdaa0dce7
branches:  trunk
changeset: 378421:b6bcdaa0dce7
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Sat Apr 07 10:53:34 2018 +0000

description:
Fix broken package due to invalid INSTALLATION_DIRS

diffstat:

 security/CSP/Makefile             |  45 +++++++++++++++++++++++++++------
 security/CSP/PLIST                |  26 ++++++++++---------
 security/CSP/distinfo             |   4 +-
 security/CSP/patches/patch-CSP.pm |  51 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 102 insertions(+), 24 deletions(-)

diffs (191 lines):

diff -r e506879a4e75 -r b6bcdaa0dce7 security/CSP/Makefile
--- a/security/CSP/Makefile     Sat Apr 07 10:38:59 2018 +0000
+++ b/security/CSP/Makefile     Sat Apr 07 10:53:34 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/02/26 12:32:41 triaxx Exp $
+# $NetBSD: Makefile,v 1.26 2018/04/07 10:53:34 triaxx Exp $
 
 DISTNAME=      CSP-0.34
 CATEGORIES=    security
@@ -7,27 +7,54 @@
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Simple PKI Toolkit
+LICENSE=       unlicense
 
 DEPENDS+=      p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
 DEPENDS+=      p5-IPC-Run>=0.79:../../devel/p5-IPC-Run
 DEPENDS+=      p5-Term-Prompt>=1.03:../../devel/p5-Term-Prompt
 
-USE_TOOLS+=    pax
 BUILD_DEFS+=   VARBASE
-OWN_DIRS=      ${VARBASE}/csp
+EGDIR=         ${PREFIX}/share/examples
+
+INSTALLATION_DIRS=     ${PREFIX}/bin ${EGDIR}/csp/public_html/certs share/doc/csp
 
-INSTALLATION_DIRS=      ${VARBASE}/csp share/doc/csp
+OWN_DIRS+=     ${PKG_SYSCONFDIR}/csp/public_html/certs
+REQD_FILES+=   ${EGDIR}/csp/aliases.txt ${PKG_SYSCONFDIR}/csp/aliases.txt
+REQD_FILES+=   ${EGDIR}/csp/crl_extensions.conf ${PKG_SYSCONFDIR}/csp/crl_extensions.conf
+REQD_FILES+=   ${EGDIR}/csp/extensions.conf ${PKG_SYSCONFDIR}/csp/extensions.conf
+REQD_FILES+=   ${EGDIR}/csp/oids.conf ${PKG_SYSCONFDIR}/csp/oids.conf
+REQD_FILES+=   ${EGDIR}/csp/types.txt ${PKG_SYSCONFDIR}/csp/types.txt
+REQD_FILES+=   ${EGDIR}/csp/public_html/index.html.mpp ${PKG_SYSCONFDIR}/csp/public_html/index.html.mpp
+REQD_FILES+=   ${EGDIR}/csp/public_html/certs/cert.html.mpp ${PKG_SYSCONFDIR}/csp/public_html/certs/cert.html.mpp
+REQD_FILES+=   ${EGDIR}/csp/public_html/certs/expired.html.mpp ${PKG_SYSCONFDIR}/csp/public_html/certs/expired.html.mpp
+REQD_FILES+=   ${EGDIR}/csp/public_html/certs/index.html.mpp ${PKG_SYSCONFDIR}/csp/public_html/certs/index.html.mpp
+REQD_FILES+=   ${EGDIR}/csp/public_html/certs/revoked.html.mpp ${PKG_SYSCONFDIR}/csp/public_html/certs/revoked.html.mpp
+REQD_FILES+=   ${EGDIR}/csp/public_html/certs/valid.html.mpp ${PKG_SYSCONFDIR}/csp/public_html/certs/valid.html.mpp
+
 
 SUBST_CLASSES+=                csp
 SUBST_FILES.csp=       csp
-SUBST_SED.csp=         -e s,@CSPHOME@,${VARBASE}/csp,
+SUBST_SED.csp=         -e s,@CSPHOME@,${PKG_SYSCONFDIR}/csp,
 SUBST_SED.csp+=                -e s,@OPENSSL@,${BUILDLINK_PREFIX.openssl}/bin/openssl,
-SUBST_STAGE.csp=       pre-install
+SUBST_STAGE.csp=       pre-configure
+
+pre-install:
+       ${INSTALL_DATA} ${DISTDIR}/cspguide.pdf ${DESTDIR}${PREFIX}/share/doc/csp
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/aliases.txt ${DESTDIR}${EGDIR}/csp/aliases.txt
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/crl_extensions.conf ${DESTDIR}${EGDIR}/csp/crl_extensions.conf
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/extensions.conf ${DESTDIR}${EGDIR}/csp/extensions.conf
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/oids.conf ${DESTDIR}${EGDIR}/csp/oids.conf
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/types.txt ${DESTDIR}${EGDIR}/csp/types.txt
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/public_html/index.html.mpp ${DESTDIR}${EGDIR}/csp/public_html/index.html.mpp
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/public_html/certs/cert.html.mpp ${DESTDIR}${EGDIR}/csp/public_html/certs/cert.html.mpp
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/public_html/certs/expired.html.mpp ${DESTDIR}${EGDIR}/csp/public_html/certs/expired.html.mpp
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/public_html/certs/index.html.mpp ${DESTDIR}${EGDIR}/csp/public_html/certs/index.html.mpp
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/public_html/certs/revoked.html.mpp ${DESTDIR}${EGDIR}/csp/public_html/certs/revoked.html.mpp
+       ${INSTALL_DATA} ${WRKSRC}/ca/etc/public_html/certs/valid.html.mpp ${DESTDIR}${EGDIR}/csp/public_html/certs/valid.html.mpp
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${CSPHOME}
-       cd ${WRKSRC}/ca && ${FIND} . -type f | pax -rw ${DESTDIR}${VARBASE}/csp
-       ${INSTALL_DATA} ${DISTDIR}/cspguide.pdf ${DESTDIR}${PREFIX}/share/doc/csp
+       ${LN} -sf ${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLVENDORBIN}/csp ${DESTDIR}${PREFIX}/bin/csp
+       ${RM} ${DESTDIR}${PREFIX}/${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod
 
 .include "../../lang/perl5/module.mk"
 .include "../../security/openssl/buildlink3.mk"
diff -r e506879a4e75 -r b6bcdaa0dce7 security/CSP/PLIST
--- a/security/CSP/PLIST        Sat Apr 07 10:38:59 2018 +0000
+++ b/security/CSP/PLIST        Sat Apr 07 10:53:34 2018 +0000
@@ -1,18 +1,20 @@
-@comment $NetBSD: PLIST,v 1.3 2018/02/26 12:32:41 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/04/07 10:53:34 triaxx Exp $
+bin/csp
 ${PERL5_SUB_INSTALLVENDORLIB}/CSP.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/CSP/autosplit.ix
 ${PERL5_SUB_INSTALLVENDORARCH}/auto/CSP/.packlist
 ${PERL5_SUB_INSTALLVENDORBIN}/csp
 ${PERL5_SUB_INSTALLVENDORMAN3DIR}/CSP.3
 share/doc/csp/cspguide.pdf
-var/csp/etc/aliases.txt
-var/csp/etc/crl_extensions.conf
-var/csp/etc/extensions.conf
-var/csp/etc/oids.conf
-var/csp/etc/public_html/certs/cert.html.mpp
-var/csp/etc/public_html/certs/expired.html.mpp
-var/csp/etc/public_html/certs/index.html.mpp
-var/csp/etc/public_html/certs/revoked.html.mpp
-var/csp/etc/public_html/certs/valid.html.mpp
-var/csp/etc/public_html/index.html.mpp
-var/csp/etc/types.txt
+share/examples/csp/aliases.txt
+share/examples/csp/crl_extensions.conf
+share/examples/csp/extensions.conf
+share/examples/csp/oids.conf
+share/examples/csp/public_html/certs/cert.html.mpp
+share/examples/csp/public_html/certs/expired.html.mpp
+share/examples/csp/public_html/certs/index.html.mpp
+share/examples/csp/public_html/certs/revoked.html.mpp
+share/examples/csp/public_html/certs/valid.html.mpp
+share/examples/csp/public_html/index.html.mpp
+share/examples/csp/types.txt
+@pkgdir lib/perl5/5.26.0/x86_64-netbsd-thread-multi
diff -r e506879a4e75 -r b6bcdaa0dce7 security/CSP/distinfo
--- a/security/CSP/distinfo     Sat Apr 07 10:38:59 2018 +0000
+++ b/security/CSP/distinfo     Sat Apr 07 10:53:34 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2018/02/26 12:32:41 triaxx Exp $
+$NetBSD: distinfo,v 1.5 2018/04/07 10:53:34 triaxx Exp $
 
 SHA1 (CSP-0.34.tar.gz) = 13440461ffc119421a6a97f62d94d35a38fde2e7
 RMD160 (CSP-0.34.tar.gz) = 68a7e3ad1ccac9628aaffd5331e2877f29e2cb38
@@ -8,5 +8,5 @@
 RMD160 (cspguide.pdf) = d4727fb6e4e44ad8c45d0749374843b38a340af9
 SHA512 (cspguide.pdf) = 2927a3d6b02e19e1acbd2230b4577d71151557cac22c59a7eebfab0d726c4deaf2826fe920065197bcd1271d37223a70ffd59fe3c3e37b93a6d8c799b5250b33
 Size (cspguide.pdf) = 152084 bytes
+SHA1 (patch-CSP.pm) = 103398cb18b16851505b24e7a313d33679dad463
 SHA1 (patch-aa) = 3d85a927385a3bf21d238f422695e759da11aaa9
-SHA1 (patch-CSP.pm) = c573643c23ac60d6aa65a2aab1d0b7dab1782c05
diff -r e506879a4e75 -r b6bcdaa0dce7 security/CSP/patches/patch-CSP.pm
--- a/security/CSP/patches/patch-CSP.pm Sat Apr 07 10:38:59 2018 +0000
+++ b/security/CSP/patches/patch-CSP.pm Sat Apr 07 10:53:34 2018 +0000
@@ -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 @@
                
                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
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/ocaml-cmdliner Revbump for devel/ocaml-cmdliner.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Remove gtk3+
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/ocaml-cmdliner Revbump for devel/ocaml-cmdliner.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Remove gtk3+
Indexes:
Home | Main Index | Thread Index | Old Index