4 files changed, 126 insertions, 153 deletions

diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 47e784b947ab..2974d25d55bf 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	p5-openxpki
-# Date created:				20 June 2006
+# Date created:				29 Sep 2006
 # Whom:					svysh
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openxpki
-PORTVERSION=	0.9.455
+PORTVERSION=	0.9.548
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	p5-
-DISTFILES=	${SERVER} ${CLIENT} ${DEPLOYMENT} ${I18N}
-DIST_SUBDIR=	${PORTNAME}
+DISTNAME=	OpenXPKI-${PORTVERSION}
+DIST_SUBDIR=	openxpki
 
 MAINTAINER=	svysh@cryptocom.ru
-COMMENT=	Perl based enterprise class trastcenter software for PKI
+COMMENT=	Perl based trustcenter software for PKI: core for server
 
 BUILD_DEPENDS=	\
 	${SITE_PERL}/Workflow.pm:${PORTSDIR}/devel/p5-Workflow \
@@ -31,34 +31,14 @@ BUILD_DEPENDS=	\
 	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
 	${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
 	${SITE_PERL}/Test/Pod/Coverage.pm:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-	${SITE_PERL}/Config/Std.pm:${PORTSDIR}/devel/p5-Config-Std \
-	${SITE_PERL}/IO/Prompt.pm:${PORTSDIR}/devel/p5-IO-Prompt \
 	${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
+	${SITE_PERL}/Class/Std.pm:${PORTSDIR}/devel/p5-Class-Std \
 	${SITE_PERL}/Mail/RFC822/Address.pm:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
+	${SITE_PERL}/${PERL_ARCH}/Proc/ProcessTable.pm:${PORTSDIR}/devel/p5-Proc-ProcessTable \
+	${SITE_PERL}/Sys/SigAction.pm:${PORTSDIR}/devel/p5-Sys-SigAction
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SERVER=		OpenXPKI-0.9.455.tar.gz
-CLIENT=		OpenXPKI-Client-0.9.450.tar.gz \
-		OpenXPKI-Client-SCEP-0.9.421.tar.gz \
-		OpenXPKI-Client-SOAP-Lite-0.9.421.tar.gz \
-		OpenXPKI-Client-CLI-0.9.443.tar.gz \
-		OpenXPKI-Client-HTML-Mason-0.9.454.tar.gz
-DEPLOYMENT=	openxpki-deployment-0.9.453.tar.gz
-I18N=		openxpki-i18n-0.9.421.tar.gz
-MAN1=	openxpki-configure.1 \
-	openxpki-metaconf.1 \
-	openxpkiadm.1 \
-	openxpkictl.1
 MAN3=	OpenXPKI.3 \
-	OpenXPKI::Client.3 \
-	OpenXPKI::Client::API.3 \
-	OpenXPKI::Client::CLI.3 \
-	OpenXPKI::Client::HTML::Mason.3 \
-	OpenXPKI::Client::HTML::Mason::Javascript.3 \
-	OpenXPKI::Client::HTML::Mason::Menu.3 \
-	OpenXPKI::Client::SCEP.3 \
-	OpenXPKI::Client::SOAP::Lite.3 \
 	OpenXPKI::Crypto::API.3 \
 	OpenXPKI::Crypto::Backend::API.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL.3 \
@@ -72,11 +52,15 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::DSA.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::EC.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::GOST2001.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::GOST2001CP.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::GOST94.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::GOST94CP.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::RSA.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_pkcs10.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_pkcs12.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_random.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::is_prime.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::issue_cert.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::issue_crl.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_decrypt.3 \
@@ -124,6 +108,9 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Server.3 \
 	OpenXPKI::Server::ACL.3 \
 	OpenXPKI::Server::API.3 \
+	OpenXPKI::Server::API::Default.3 \
+	OpenXPKI::Server::API::Object.3 \
+	OpenXPKI::Server::API::Visualization.3 \
 	OpenXPKI::Server::API::Workflow.3 \
 	OpenXPKI::Server::Authentication.3 \
 	OpenXPKI::Server::Authentication::Anonymous.3 \
@@ -140,7 +127,6 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Server::DBI::Driver::PostgreSQL.3 \
 	OpenXPKI::Server::DBI::Driver::SQLite.3 \
 	OpenXPKI::Server::DBI::Hash.3 \
-	OpenXPKI::Server::DBI::Object.3 \
 	OpenXPKI::Server::DBI::SQL.3 \
 	OpenXPKI::Server::DBI::Schema.3 \
 	OpenXPKI::Server::Init.3 \
@@ -150,21 +136,56 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Server::Session::Mock.3 \
 	OpenXPKI::Server::Workflow.3 \
 	OpenXPKI::Server::Workflow::Activity.3 \
-	OpenXPKI::Server::Workflow::Activity::Certificate::Issue.3 \
+	OpenXPKI::Server::Workflow::Activity::CRLIssuance::DetermineNextCA.3 \
+	OpenXPKI::Server::Workflow::Activity::CRLIssuance::GetCRLProfile.3 \
+	OpenXPKI::Server::Workflow::Activity::CRLIssuance::IssueCRL.3 \
+	OpenXPKI::Server::Workflow::Activity::CRLIssuance::PublishCRL.3 \
+	OpenXPKI::Server::Workflow::Activity::CertIssuance::GetCertProfile.3 \
+	OpenXPKI::Server::Workflow::Activity::CertIssuance::ImportCertData.3 \
+	OpenXPKI::Server::Workflow::Activity::CertIssuance::Issue.3 \
+	OpenXPKI::Server::Workflow::Activity::CertIssuance::PersistCertificate.3 \
+	OpenXPKI::Server::Workflow::Activity::CertRequest::PersistRequest.3 \
+	OpenXPKI::Server::Workflow::Activity::CertRequest::SetSource.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::Cleanup.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::ExportLogs.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::ExportWorkflowInstances.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::ImportLogs.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::ImportWorkflowInstances.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::PackArchive.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::PrepareEnv.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::ReadArchive.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::UnpackArchive.3 \
+	OpenXPKI::Server::Workflow::Activity::DataExchange::WriteArchive.3 \
 	OpenXPKI::Server::Workflow::Activity::Key::Generate.3 \
 	OpenXPKI::Server::Workflow::Activity::Passphrase::Generate.3 \
 	OpenXPKI::Server::Workflow::Activity::Profile::Create.3 \
 	OpenXPKI::Server::Workflow::Activity::Request::Certificate::DataOnly::Create.3 \
 	OpenXPKI::Server::Workflow::Activity::Request::Certificate::PKCS10::Create.3 \
 	OpenXPKI::Server::Workflow::Activity::Skeleton.3 \
+	OpenXPKI::Server::Workflow::Activity::Tools::Approve.3 \
+	OpenXPKI::Server::Workflow::Activity::Tools::CancelApprovals.3 \
+	OpenXPKI::Server::Workflow::Activity::Tools::CreateWorkflowInstance.3 \
 	OpenXPKI::Server::Workflow::Activity::Tools::DetermineIssuingCA.3 \
+	OpenXPKI::Server::Workflow::Activity::Tools::Export.3 \
+	OpenXPKI::Server::Workflow::Activity::Tools::ForkWorkflowInstance.3 \
+	OpenXPKI::Server::Workflow::Activity::Tools::Sleep.3 \
 	OpenXPKI::Server::Workflow::Condition::ACL.3 \
+	OpenXPKI::Server::Workflow::Condition::Approved.3 \
+	OpenXPKI::Server::Workflow::Condition::CRLSigningCAsLeft.3 \
+	OpenXPKI::Server::Workflow::Condition::ContextParameterExistence.3 \
+	OpenXPKI::Server::Workflow::Condition::Key.3 \
+	OpenXPKI::Server::Workflow::Condition::Server.3 \
+	OpenXPKI::Server::Workflow::Condition::WorkflowChildrenSuccessfullyFinished.3 \
+	OpenXPKI::Server::Workflow::Observer::Log.3 \
 	OpenXPKI::Server::Workflow::Persister::DBI.3 \
 	OpenXPKI::Server::Workflow::Persister::DBI::SequenceId.3 \
 	OpenXPKI::Server::Workflow::Validator::CertProfile.3 \
+	OpenXPKI::Server::Workflow::Validator::CertRole.3 \
 	OpenXPKI::Server::Workflow::Validator::CertSubject.3 \
 	OpenXPKI::Server::Workflow::Validator::CertSubjectAltName.3 \
+	OpenXPKI::Server::Workflow::Validator::PKCS10.3 \
 	OpenXPKI::Server::Workflow::Validator::SPKAC.3 \
+	OpenXPKI::Server::Workflow::Validator::SetContextParameter.3 \
 	OpenXPKI::Service.3 \
 	OpenXPKI::Service::Default.3 \
 	OpenXPKI::Service::Default::Command.3 \
@@ -180,54 +201,13 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::XML::Config.3 \
 	OpenXPKI::i18n.3
 USE_PERL5=	yes
-USE_GETTEXT=	yes
-### We can not do WITHOUT_NLS. Internationalization is needed
-### even to use English language.
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 WITH_OPENSSL_BETA=	yes
-PERL_DIRS=	${SERVER} ${CLIENT}
-NO_PERL_DIRS=	${DEPLOYMENT} ${I18N}
-MAKE_MAKER_ENV=	PREFIX=${PREFIX}
-DESTDIR?=	/.
-#CONFIGURE_ARGS=	--prefix ${PREFIX} --dest ${DESTDIR} # To be used in next ver.
-CONFIGURE_ARGS=	--prefix ${PREFIX}
-MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
-
-do-configure:
-	@ for dir in ${PERL_DIRS}; do \
-		dir="`${ECHO} $${dir} | ${SED} -e 's/.tar.gz//'`"; \
-		cd ${WRKDIR}/$${dir} && \
-		${ECHO} "DIR= $${dir}" && ${PERL5} Makefile.PL ${MAKE_MAKER_ENV}; \
-		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile; \
-	done
-
-do-build:
-	@ for dir in ${PERL_DIRS}; do \
-		dir="`${ECHO} $${dir} | ${SED} -e 's/.tar.gz//'`"; \
-		cd ${WRKDIR}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
-	done
-
-do-install:
-	@ for dir in ${PERL_DIRS}; do \
-		dir="`${ECHO} $${dir} | ${SED} -e 's/.tar.gz//'`"; \
-		cd ${WRKDIR}/$${dir} && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
-	done
+PERL_CONFIGURE=	yes
 
 post-install:
 	${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
-	@ for dir in ${NO_PERL_DIRS}; do \
-		dir="`${ECHO} $${dir} | ${SED} -e 's/.tar.gz//'`"; \
-		cd ${WRKDIR}/$${dir} && \
-		${ECHO} "DIR= $${dir}" && \
-		if [ -f ./${CONFIGURE_SCRIPT} ]; then \
-			${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
-		fi && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
-	done
-#	@${ECHO} "TARGETDIR = ${TARGETDIR}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/p5-openxpki/distinfo b/security/p5-openxpki/distinfo
index 7d56dc0b9cab..3356e969a025 100644
--- a/security/p5-openxpki/distinfo
+++ b/security/p5-openxpki/distinfo
@@ -1,24 +1,3 @@
-MD5 (openxpki/OpenXPKI-0.9.455.tar.gz) = 193e50e24143576a5addf44ba1ba9d00
-SHA256 (openxpki/OpenXPKI-0.9.455.tar.gz) = 029b7cda000727b599bc81925360707bfa65bf56b080a0e27731a36c8e19a033
-SIZE (openxpki/OpenXPKI-0.9.455.tar.gz) = 209204
-MD5 (openxpki/OpenXPKI-Client-0.9.450.tar.gz) = 7dfdbb9cca092bddeeb6a84a84a6384f
-SHA256 (openxpki/OpenXPKI-Client-0.9.450.tar.gz) = 1383280e9d7630782c0e33372a713d937b41ad509062248b5c88a09b7de11d5a
-SIZE (openxpki/OpenXPKI-Client-0.9.450.tar.gz) = 12482
-MD5 (openxpki/OpenXPKI-Client-SCEP-0.9.421.tar.gz) = 70e28aeddcc7b13b0918e806ca765295
-SHA256 (openxpki/OpenXPKI-Client-SCEP-0.9.421.tar.gz) = c3c89bcc69cb9e131a353f0eb228090e9abc4bdc1c453812bf89d4cc54f97753
-SIZE (openxpki/OpenXPKI-Client-SCEP-0.9.421.tar.gz) = 8052
-MD5 (openxpki/OpenXPKI-Client-SOAP-Lite-0.9.421.tar.gz) = c8dfbede0b8170d21d770ad14651ae36
-SHA256 (openxpki/OpenXPKI-Client-SOAP-Lite-0.9.421.tar.gz) = aa19111c4765c2e730feb1e440e291dbff024108944a106ffd532a92caefa0fe
-SIZE (openxpki/OpenXPKI-Client-SOAP-Lite-0.9.421.tar.gz) = 4438
-MD5 (openxpki/OpenXPKI-Client-CLI-0.9.443.tar.gz) = 79e453de12aeb0a3050355b575ef1a9e
-SHA256 (openxpki/OpenXPKI-Client-CLI-0.9.443.tar.gz) = afddc244b843744b964244959f625ca6a83d2b1f9f00c2aa35b96bfa8349722c
-SIZE (openxpki/OpenXPKI-Client-CLI-0.9.443.tar.gz) = 10457
-MD5 (openxpki/OpenXPKI-Client-HTML-Mason-0.9.454.tar.gz) = 64feab9e6b5714d6ed8ff29a1b35432b
-SHA256 (openxpki/OpenXPKI-Client-HTML-Mason-0.9.454.tar.gz) = 74aa3134a54cb869cf21a4cf1c9a650b43e62434a4e87501260c901b1d37db94
-SIZE (openxpki/OpenXPKI-Client-HTML-Mason-0.9.454.tar.gz) = 37589
-MD5 (openxpki/openxpki-deployment-0.9.453.tar.gz) = 768000c90f628e31a9ca043bf10887de
-SHA256 (openxpki/openxpki-deployment-0.9.453.tar.gz) = 40a2384d88560e6e92e92f206cbd2227445e7154c29566b4dfc3f22cad880249
-SIZE (openxpki/openxpki-deployment-0.9.453.tar.gz) = 29913
-MD5 (openxpki/openxpki-i18n-0.9.421.tar.gz) = 5ac8594e6857f8a69634093d2156d3d4
-SHA256 (openxpki/openxpki-i18n-0.9.421.tar.gz) = 811298c997e586dfb48eb1e21cd91d5cdcd735e9bc03d6abe575ad659c68af60
-SIZE (openxpki/openxpki-i18n-0.9.421.tar.gz) = 34495
+MD5 (openxpki/OpenXPKI-0.9.548.tar.gz) = f9c71a82282182d3aa32f626797bdbdb
+SHA256 (openxpki/OpenXPKI-0.9.548.tar.gz) = f4f2550b2b84cf1d4ba05395477f58d4d2f896e88742472b6d4fda4facad53a1
+SIZE (openxpki/OpenXPKI-0.9.548.tar.gz) = 245550
diff --git a/security/p5-openxpki/pkg-descr b/security/p5-openxpki/pkg-descr
index d2bf090c5984..dccf2ae39cd6 100644
--- a/security/p5-openxpki/pkg-descr
+++ b/security/p5-openxpki/pkg-descr
@@ -1,4 +1,24 @@
-OpenXPKI - Perl based enterprise class trastcenter software 
-           for PKI: server and client parts
+A collection of ports for the OpenXPKI suite - Perl based trustcenter 
+software for PKI: server and client parts along with deployment tools.
+
+p5-openxpki: core for server part
+p5-openxpki-client: base class for actual clients
+p5-openxpki-i18n: internationalization of the user interface
+p5-openxpki-client-cli: command line interface to local OpenXPKI daemon
+p5-openxpki-client-html-mason: web interface to local OpenXPKI daemon
+p5-openxpki-client-scep: set of SCEP tools
+p5-openxpki-client-soap-lite: set of SOAP-Lite tools
+p5-openxpki-deployment: set or deployment tools
+
+Dependencies of OpenXPKI ports ("A --> B" means that port B depends on port A):
+
+ p5-openxpki-client  <--  p5-openxpki (server)  -->  p5-openxpki-i18n
+           \
+            \     |  p5-openxpki-client-cli, p5-openxpki-client-html-mason,
+             \--> |  p5-openxpki-client-scep, p5-openxpki-client-soap-lite, 
+                  |  p5-openxpki-deployment.
+Notes: 
+I18n is needed for the English interface too. For effective use of deployment,
+it is recommended to install at least one of the clients: ...-cli or ...-mason.
 
 WWW: http://www.openxpki.org/
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index 6d149e78733c..6e973e8973c9 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -1,15 +1,3 @@
-bin/openxpki-configure
-bin/openxpki-metaconf
-bin/openxpkiadm
-bin/openxpkictl
-%%SITE_PERL%%/OpenXPKI/Client.pm
-%%SITE_PERL%%/OpenXPKI/Client/API.pm
-%%SITE_PERL%%/OpenXPKI/Client/CLI.pm
-%%SITE_PERL%%/OpenXPKI/Client/HTML/Mason.pm
-%%SITE_PERL%%/OpenXPKI/Client/HTML/Mason/Javascript.pm
-%%SITE_PERL%%/OpenXPKI/Client/HTML/Mason/Menu.pm
-%%SITE_PERL%%/OpenXPKI/Client/SCEP.pm
-%%SITE_PERL%%/OpenXPKI/Client/SOAP/Lite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/API.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/API.pm
@@ -25,11 +13,15 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/DSA.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/EC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST2001.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST2001CP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST94.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/GOST94CP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_key/RSA.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkcs10.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_pkcs12.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/create_random.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/is_prime.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/issue_cert.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/issue_crl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_decrypt.pm
@@ -81,6 +73,9 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/ACL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Default.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Visualization.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API/Workflow.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/Anonymous.pm
@@ -97,7 +92,6 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver/PostgreSQL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver/SQLite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Hash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Object.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/SQL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Schema.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Init.pm
@@ -107,21 +101,57 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Session/Mock.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Certificate/Issue.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/DetermineNextCA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/GetCRLProfile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/IssueCRL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance/PublishCRL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance/GetCertProfile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance/ImportCertData.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance/Issue.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance/PersistCertificate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertRequest/PersistRequest.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertRequest/SetSource.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/Cleanup.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/ExportLogs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/ExportWorkflowInstances.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/ImportLogs.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/ImportWorkflowInstances.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/PackArchive.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/PrepareEnv.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/ReadArchive.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/UnpackArchive.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange/WriteArchive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Key/Generate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Passphrase/Generate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Profile/Create.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Request/Certificate/DataOnly/Create.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Request/Certificate/PKCS10/Create.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Skeleton.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Approve.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CancelApprovals.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/CreateWorkflowInstance.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/DetermineIssuingCA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Export.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ForkWorkflowInstance.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Sleep.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/ACL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Approved.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/CRLSigningCAsLeft.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/ContextParameterExistence.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Key.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/Server.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/WorkflowChildrenSuccessfullyFinished.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Observer/AddExecuteHistory.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Observer/Log.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI/SequenceId.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertProfile.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertRole.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubject.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectAltName.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/PKCS10.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/SPKAC.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/SetContextParameter.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default/Command.pm
@@ -137,43 +167,8 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/XML/Config.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/i18n.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/CLI/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML/Mason/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SCEP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SOAP/Lite/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/OpenXPKI.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/OpenXPKI.so
-share/locale/de_DE/LC_MESSAGES/openxpki.mo
-share/locale/en_GB/LC_MESSAGES/openxpki.mo
-%%DATADIR%%/templates/default/acl.xml
-%%DATADIR%%/templates/default/auth.xml
-%%DATADIR%%/templates/default/config.xml
-%%DATADIR%%/templates/default/database.xml
-%%DATADIR%%/templates/default/log.conf
-%%DATADIR%%/templates/default/openxpki.conf
-%%DATADIR%%/templates/default/profile.xml
-%%DATADIR%%/templates/default/token.xml
-%%DATADIR%%/templates/default/workflow.xml
-%%DATADIR%%/templates/default/workflow_activity.xml
-%%DATADIR%%/templates/default/workflow_activity_certificate_signing_request.xml
-%%DATADIR%%/templates/default/workflow_activity_null.xml
-%%DATADIR%%/templates/default/workflow_condition.xml
-%%DATADIR%%/templates/default/workflow_def_certificate_signing_request.xml
-%%DATADIR%%/templates/default/workflow_request_dataonly.xml
-%%DATADIR%%/templates/default/workflow_validator_certificate_signing_request.xml
-@dirrmtry %%DATADIR%%/templates/default
-@dirrmtry %%DATADIR%%/templates
-@dirrmtry %%DATADIR%%
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SOAP/Lite
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SOAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SCEP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML/Mason
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/CLI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/XML
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Transport
@@ -185,6 +180,7 @@ share/locale/en_GB/LC_MESSAGES/openxpki.mo
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Persister
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Observer
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Request/Certificate/PKCS10
@@ -194,7 +190,10 @@ share/locale/en_GB/LC_MESSAGES/openxpki.mo
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Profile
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Passphrase
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Key
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Certificate
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/DataExchange
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertRequest
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/CRLIssuance
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Session
@@ -220,8 +219,3 @@ share/locale/en_GB/LC_MESSAGES/openxpki.mo
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI
-@dirrm %%SITE_PERL%%/OpenXPKI/Client/SOAP
-@dirrm %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason
-@dirrm %%SITE_PERL%%/OpenXPKI/Client/HTML
-@dirrm %%SITE_PERL%%/OpenXPKI/Client
-@dirrm %%SITE_PERL%%/OpenXPKI