CVS commit: pkgsrc/security/CSP

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security/CSP
From: Frédéric Fauberteau <triaxx%netbsd.org@localhost>
Date: Mon, 26 Feb 2018 12:32:41 +0000

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Feb 26 12:32:41 UTC 2018

Modified Files:
        pkgsrc/security/CSP: Makefile PLIST distinfo
        pkgsrc/security/CSP/patches: patch-aa
Added Files:
        pkgsrc/security/CSP/patches: patch-CSP.pm

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/CSP/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/CSP/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/CSP/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/CSP/patches/patch-CSP.pm
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/CSP/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/CSP/Makefile
diff -u pkgsrc/security/CSP/Makefile:1.24 pkgsrc/security/CSP/Makefile:1.25
--- pkgsrc/security/CSP/Makefile:1.24   Mon Feb 26 08:00:08 2018
+++ pkgsrc/security/CSP/Makefile        Mon Feb 26 12:32:41 2018
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2018/02/26 08:00:08 triaxx Exp $
+# $NetBSD: Makefile,v 1.25 2018/02/26 12:32:41 triaxx Exp $
 
 DISTNAME=      CSP-0.34
 CATEGORIES=    security
-#MASTER_SITES= ftp://ftp.su.se/pub/users/leifj/
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${CSPGUIDE}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} cspguide.pdf
+EXTRACT_ONLY=  ${DISTFILES:N*.pdf}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://devel.it.su.se/pub/jsp/polopoly.jsp?d=1026&a=3290
 COMMENT=       Simple PKI Toolkit
 
 DEPENDS+=      p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
@@ -15,30 +14,20 @@ DEPENDS+=   p5-Term-Prompt>=1.03:../../dev
 
 USE_TOOLS+=    pax
 BUILD_DEFS+=   VARBASE
+OWN_DIRS=      ${VARBASE}/csp
 
-CSPGUIDE=      cspguide.pdf
-#SITES.${CSPGUIDE}=    http://devel.it.su.se/content/1/c4/32/90/
-EXTRACT_ONLY=  ${DISTFILES:N*.pdf}
-
-PERL5_PACKLIST=        auto/CSP/.packlist
-
-CSPHOME=       ${VARBASE}/csp
-OPENSSLBIN=    ${BUILDLINK_PREFIX.openssl}/bin/openssl
-OWN_DIRS=      ${CSPHOME}
-INSTALLATION_DIRS=     share/doc/csp
-
-BUILD_DEFS+=   CSPHOME
+INSTALLATION_DIRS=      ${VARBASE}/csp share/doc/csp
 
 SUBST_CLASSES+=                csp
 SUBST_FILES.csp=       csp
-SUBST_SED.csp=         -e s,@@CSPHOME@@,${CSPHOME},
-SUBST_SED.csp+=                -e s,@@OPENSSL@@,${OPENSSLBIN},
-SUBST_STAGE.csp=       post-patch
+SUBST_SED.csp=         -e s,@CSPHOME@,${VARBASE}/csp,
+SUBST_SED.csp+=                -e s,@OPENSSL@,${BUILDLINK_PREFIX.openssl}/bin/openssl,
+SUBST_STAGE.csp=       pre-install
 
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${CSPHOME}
-       cd ${WRKSRC}/ca && ${FIND} . -type f | pax -rw ${DESTDIR}${CSPHOME}
-       ${INSTALL_DATA} ${DISTDIR}/${CSPGUIDE} ${DESTDIR}${PREFIX}/share/doc/csp
+       cd ${WRKSRC}/ca && ${FIND} . -type f | pax -rw ${DESTDIR}${VARBASE}/csp
+       ${INSTALL_DATA} ${DISTDIR}/cspguide.pdf ${DESTDIR}${PREFIX}/share/doc/csp
 
 .include "../../lang/perl5/module.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/security/CSP/PLIST
diff -u pkgsrc/security/CSP/PLIST:1.2 pkgsrc/security/CSP/PLIST:1.3
--- pkgsrc/security/CSP/PLIST:1.2       Mon Feb 26 08:00:08 2018
+++ pkgsrc/security/CSP/PLIST   Mon Feb 26 12:32:41 2018
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/02/26 08:00:08 triaxx Exp $
-${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod
+@comment $NetBSD: PLIST,v 1.3 2018/02/26 12:32:41 triaxx Exp $
 ${PERL5_SUB_INSTALLVENDORLIB}/CSP.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/auto/CSP/autosplit.ix
 ${PERL5_SUB_INSTALLVENDORARCH}/auto/CSP/.packlist

Index: pkgsrc/security/CSP/distinfo
diff -u pkgsrc/security/CSP/distinfo:1.3 pkgsrc/security/CSP/distinfo:1.4
--- pkgsrc/security/CSP/distinfo:1.3    Mon Feb 26 08:00:08 2018
+++ pkgsrc/security/CSP/distinfo        Mon Feb 26 12:32:41 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/02/26 08:00:08 triaxx Exp $
+$NetBSD: distinfo,v 1.4 2018/02/26 12:32:41 triaxx Exp $
 
 SHA1 (CSP-0.34.tar.gz) = 13440461ffc119421a6a97f62d94d35a38fde2e7
 RMD160 (CSP-0.34.tar.gz) = 68a7e3ad1ccac9628aaffd5331e2877f29e2cb38
@@ -8,4 +8,5 @@ SHA1 (cspguide.pdf) = f527519553d7c64f62
 RMD160 (cspguide.pdf) = d4727fb6e4e44ad8c45d0749374843b38a340af9
 SHA512 (cspguide.pdf) = 2927a3d6b02e19e1acbd2230b4577d71151557cac22c59a7eebfab0d726c4deaf2826fe920065197bcd1271d37223a70ffd59fe3c3e37b93a6d8c799b5250b33
 Size (cspguide.pdf) = 152084 bytes
-SHA1 (patch-aa) = c97840d43189a14361646b79d826162bf8d22bc3
+SHA1 (patch-aa) = 3d85a927385a3bf21d238f422695e759da11aaa9
+SHA1 (patch-CSP.pm) = c573643c23ac60d6aa65a2aab1d0b7dab1782c05

Index: pkgsrc/security/CSP/patches/patch-aa
diff -u pkgsrc/security/CSP/patches/patch-aa:1.2 pkgsrc/security/CSP/patches/patch-aa:1.3
--- pkgsrc/security/CSP/patches/patch-aa:1.2    Mon Feb 26 08:00:08 2018
+++ pkgsrc/security/CSP/patches/patch-aa        Mon Feb 26 12:32:41 2018
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2018/02/26 08:00:08 triaxx Exp $
+$NetBSD: patch-aa,v 1.3 2018/02/26 12:32:41 triaxx Exp $
 
 Add variables for SUBST.
 
---- csp.orig   2005-06-02 18:40:20.000000000 +0200
+--- csp.orig   2007-03-10 22:28:34.000000000 +0000
 +++ csp
 @@ -167,14 +167,16 @@ die $usage{_nocmd_} unless @ARGV > 0;
  
  my $name = shift @ARGV;
  
-+my $home = $ENV{CSPHOME} || '@@CSPHOME@@';
++my $home = $ENV{CSPHOME} || '@CSPHOME@';
 +
  warn "Warning: \$CSPHOME unset. This may prevent CSP from working properly.\n"
 -  unless $ENV{CSPHOME};
 +  unless -d $home;
 +
-+$ENV{OPENSSL} = '@@OPENSSL@@' unless defined($ENV{OPENSSL});
++$ENV{OPENSSL} = '@OPENSSL@' unless defined($ENV{OPENSSL});
  
  die "Panic: \$OPENSSL does not point to a executable.\n"
    unless -x $ENV{OPENSSL};

Added files:

Index: pkgsrc/security/CSP/patches/patch-CSP.pm
diff -u /dev/null pkgsrc/security/CSP/patches/patch-CSP.pm:1.1
--- /dev/null   Mon Feb 26 12:32:41 2018
+++ pkgsrc/security/CSP/patches/patch-CSP.pm    Mon Feb 26 12:32:41 2018
@@ -0,0 +1,24 @@
+$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 $@;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/net/torsocks
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/net/torsocks
Indexes:

Home | Main Index | Thread Index | Old Index