4 files changed, 27 insertions, 29 deletions

diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 622d38d4d397..4fc5cc0ca9cd 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openxpki
-PORTVERSION=	1.5.0
+PORTVERSION=	1.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security perl5
 PKGNAMEPREFIX=	p5-
@@ -121,14 +121,15 @@ IGNORE=	this version of OpenXPKI is not fully functional with LibreSSL library,
 OXLIB=	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OpenXPKI/OpenXPKI.so
 
 post-install:
-	${CHMOD} u+w ${OXLIB}
 	${STRIP_CMD} ${OXLIB}
-	${CHMOD} u-w ${OXLIB}
+
 post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@(cd ${WRKSRC}/../.. && ${COPYTREE_SHARE} config ${STAGEDIR}${EXAMPLESDIR})
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "htdocs cgi-bin" ${STAGEDIR}${EXAMPLESDIR})
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/../.. && ${COPYTREE_SHARE} config ${STAGEDIR}${EXAMPLESDIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "htdocs cgi-bin" ${STAGEDIR}${EXAMPLESDIR})
+
 post-install-DOCS-on:
-		@${MKDIR} ${STAGEDIR}${DOCSDIR}
-		@(cd ${WRKSRC}/../../doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/../../doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
 .include <bsd.port.post.mk>
diff --git a/security/p5-openxpki/distinfo b/security/p5-openxpki/distinfo
index 33b058ed7e7c..ee214469c056 100644
--- a/security/p5-openxpki/distinfo
+++ b/security/p5-openxpki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openxpki-openxpki-v1.5.0_GH0.tar.gz) = 34a4bf322f1aec57f798a313cedfa232df36e952504ac878dc2fc1107cfbdeb2
-SIZE (openxpki-openxpki-v1.5.0_GH0.tar.gz) = 2265963
+SHA256 (openxpki-openxpki-v1.8.0_GH0.tar.gz) = bfba9b421a0bb0ca1b166549ae8f7843f5ceeeb88cb0f83b63ba33db19c15bd1
+SIZE (openxpki-openxpki-v1.8.0_GH0.tar.gz) = 2115291
diff --git a/security/p5-openxpki/files/patch-Makefile.PL b/security/p5-openxpki/files/patch-Makefile.PL
index fdbf432f4465..c8a955ce61b2 100644
--- a/security/p5-openxpki/files/patch-Makefile.PL
+++ b/security/p5-openxpki/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	2014-12-02 20:05:23 UTC
+--- Makefile.PL.orig	2016-04-07 09:30:16 UTC
 +++ Makefile.PL
-@@ -249,49 +249,6 @@ else {
+@@ -267,49 +267,6 @@ else {
    print STDERR "Logger is not installed. Continue anyway.\n";
  }
  
@@ -50,7 +50,7 @@
  # See lib/ExtUtils/MakeMaker.pm for details of how to influence
  # the contents of the Makefile that is written.
  WriteMakefile(
-@@ -299,7 +256,6 @@ WriteMakefile(
+@@ -317,7 +274,6 @@ WriteMakefile(
      'VERSION'   => $openxpki_version,
      'LIBS'      => ["-L$openssl_lib_dir -lcrypto"],
      'INC'       => "-I. -I$openssl_inc_dir",
@@ -58,7 +58,7 @@
      'PREREQ_PM' => {
  #    'Class::Accessor::Fast'  => '0.31', # Constituent of module Class::Accessor
  #					 # which is a prerequisite of Class::Accessor::Chained, see below
-@@ -397,5 +353,4 @@ WriteMakefile(
+@@ -420,5 +376,4 @@ WriteMakefile(
                                't/cfg.binary.openssl']},
      'XSPROTOARG' => '-noprototypes',
      'EXE_FILES' => [ 'bin/openxpkictl','bin/openxpkicmd', 'bin/openxpkiadm', 'bin/openxpkicli'],    
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index a1a71b8961f3..b4482e1a8f7f 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -3,7 +3,6 @@ bin/openxpkicli
 bin/openxpkicmd
 bin/openxpkictl
 %%SITE_ARCH%%/OpenXPKI.pm
-%%SITE_ARCH%%/OpenXPKI/Assert.pm
 %%SITE_ARCH%%/OpenXPKI/Client.pm
 %%SITE_ARCH%%/OpenXPKI/Client/API.pm
 %%SITE_ARCH%%/OpenXPKI/Client/Config.pm
@@ -227,6 +226,7 @@ bin/openxpkictl
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Approve.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CalculateKeyId.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CancelApprovals.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CertificateExport.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Connector/GetValue.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/AppendToEntry.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Datapool/DeleteEntry.pm
@@ -236,9 +236,11 @@ bin/openxpkictl
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Disconnect.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/EvaluateSignerTrust.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Export.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ExportToFile.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GenerateKey.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GeneratePassword.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/GetCertificateIdentifier.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/InjectExtraParam.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ListActiveToken.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/LoadCertificateMetadata.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Notify.pm
@@ -254,6 +256,7 @@ bin/openxpkictl
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RevokeCertificate.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetAttribute.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetContext.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetContextHash.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetErrorCode.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetSource.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/TriggerCertificatePublish.pm
@@ -269,16 +272,15 @@ bin/openxpkictl
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Approved.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/CertificateHasStatus.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/CertificateNotYetRevoked.pm
-%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/CheckExistingCertificate.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Connector/Exists.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Connector/IsValue.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/DatapoolEntry.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/DateTime.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/HasRole.pm
+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/IsCertificateOwner.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/IsServerKeyGeneration.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/Key.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/KeyGenerationMode.pm
-%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/MaxIterationsNotReached.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/NICE/IsCertificateIssued.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/NICE/IsCertificatePending.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/SCEPv2/ValidSCEPTID.pm
@@ -306,13 +308,11 @@ bin/openxpkictl
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/ApprovalSignature.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Bulk.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertIdentifierExists.pm
-%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertProfile.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubject.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectAltNameParts.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectFields.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectParts.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Connector.pm
-%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Creator.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/InvalidityTime.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/KeyLength.pm
 %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/KeyReuse.pm
@@ -560,6 +560,7 @@ bin/openxpkictl
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Approve.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::CalculateKeyId.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::CancelApprovals.3.gz
+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::CertificateExport.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Connector::GetValue.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Datapool::AppendToEntry.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Datapool::DeleteEntry.3.gz
@@ -569,9 +570,11 @@ bin/openxpkictl
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Disconnect.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::EvaluateSignerTrust.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Export.3.gz
+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::ExportToFile.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::GenerateKey.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::GeneratePassword.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::GetCertificateIdentifier.3.gz
+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::InjectExtraParam.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::ListActiveToken.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Notify.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::ParseCertificate.3.gz
@@ -585,6 +588,7 @@ bin/openxpkictl
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::RevokeCertificate.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::SetAttribute.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::SetContext.3.gz
+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::SetContextHash.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::SetErrorCode.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::SetSource.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::TriggerCertificatePublish.3.gz
@@ -599,16 +603,15 @@ bin/openxpkictl
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::Approved.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::CertificateHasStatus.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::CertificateNotYetRevoked.3.gz
-%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::CheckExistingCertificate.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::Connector::Exists.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::Connector::IsValue.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::DatapoolEntry.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::DateTime.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::HasRole.3.gz
+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::IsCertificateOwner.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::IsServerKeyGeneration.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::Key.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::KeyGenerationMode.3.gz
-%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::MaxIterationsNotReached.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::NICE::IsCertificateIssued.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::NICE::IsCertificatePending.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::SCEPv2::ValidSCEPTID.3.gz
@@ -634,13 +637,11 @@ bin/openxpkictl
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::ApprovalSignature.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::Bulk.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::CertIdentifierExists.3.gz
-%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::CertProfile.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::CertSubject.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::CertSubjectAltNameParts.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::CertSubjectFields.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::CertSubjectParts.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::Connector.3.gz
-%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::Creator.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::InvalidityTime.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::KeyLength.3.gz
 %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Validator::KeyReuse.3.gz
@@ -705,11 +706,6 @@ bin/openxpkictl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/smartcard/config.d/realm/ca-one/workflow/def/sc_revoke.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/smartcard/config.d/realm/ca-one/workflow/def/sc_server_load.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/_workflow/workflow_activity_cert_export.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/_workflow/workflow_activity_testing.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/_workflow/workflow_condition_cert_export.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/_workflow/workflow_def_cert_export.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/_workflow/workflow_def_testing.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/approval.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/cert_revoke.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/feature/unsorted/config.d/realm/ca-one/export.yaml
@@ -778,6 +774,7 @@ bin/openxpkictl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/def/enrollment.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/def/report_full.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/def/report_summary.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/def/set_motd.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/def/status_process.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/def/status_system.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/action/cancel.yaml
@@ -792,6 +789,7 @@ bin/openxpkictl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/action/noop3.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/action/skip.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/condition/is_batch_mode.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/condition/is_certificate_owner.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/condition/is_creator.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/condition/is_operator.yaml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/global/field/approval_count.yaml
@@ -881,7 +879,6 @@ bin/openxpkictl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htdocs/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htdocs/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htdocs/vendor/ember/ember-template-compiler.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config/openxpki/config.d/realm/ca-one/workflow/def/set_motd.yaml
 @dir(openxpki,openxpki,754) %%ETCDIR%%
 @dir(openxpki,openxpki,751) /var/log/openxpki
 @dir(openxpki,openxpki,750) /var/openxpki/session