3 files changed, 87 insertions, 57 deletions

diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 5ff75021e4cc..47e784b947ab 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openxpki
-PORTVERSION=	0.9.402
+PORTVERSION=	0.9.455
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,17 +33,19 @@ BUILD_DEPENDS=	\
 	${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}/Mail/RFC822/Address.pm:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
 	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-SERVER=		OpenXPKI-0.9.402.tar.gz
-CLIENT=		OpenXPKI-Client-0.9.349.tar.gz \
-		OpenXPKI-Client-SCEP-0.9.342.tar.gz \
-		OpenXPKI-Client-SOAP-Lite-0.9.342.tar.gz \
-		OpenXPKI-Client-CLI-0.9.389.tar.gz \
-		OpenXPKI-Client-HTML-Mason-0.9.402.tar.gz
-DEPLOYMENT=	openxpki-deployment-0.9.402.tar.gz
-I18N=		openxpki-i18n-0.9.402.tar.gz
+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 \
@@ -57,6 +59,7 @@ MAN3=	OpenXPKI.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 \
 	OpenXPKI::Crypto::Backend::OpenSSL::CLI.3 \
@@ -88,6 +91,7 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Engine::OpenSSL.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Engine::nCipher.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::XS.3 \
+	OpenXPKI::Crypto::CLI.3 \
 	OpenXPKI::Crypto::CRL.3 \
 	OpenXPKI::Crypto::CRR.3 \
 	OpenXPKI::Crypto::CSR.3 \
@@ -97,18 +101,30 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Crypto::Profile::Base.3 \
 	OpenXPKI::Crypto::Profile::CRL.3 \
 	OpenXPKI::Crypto::Profile::Certificate.3 \
+	OpenXPKI::Crypto::Secret.3 \
+	OpenXPKI::Crypto::Secret::Plain.3 \
+	OpenXPKI::Crypto::Secret::Split.3 \
 	OpenXPKI::Crypto::TokenManager.3 \
+	OpenXPKI::Crypto::Tool::SCEP.3 \
+	OpenXPKI::Crypto::Tool::SCEP::API.3 \
+	OpenXPKI::Crypto::Tool::SCEP::CLI.3 \
+	OpenXPKI::Crypto::Tool::SCEP::Command::get_message_type.3 \
+	OpenXPKI::Crypto::Tool::SCEP::Command::get_transaction_id.3 \
+	OpenXPKI::Crypto::Tool::SCEP::Engine::OpenSSL.3 \
+	OpenXPKI::Crypto::Toolkit.3 \
 	OpenXPKI::Crypto::VolatileVault.3 \
 	OpenXPKI::Crypto::X509.3 \
 	OpenXPKI::DN.3 \
 	OpenXPKI::DateTime.3 \
 	OpenXPKI::Debug.3 \
 	OpenXPKI::Exception.3 \
+	OpenXPKI::FileUtils.3 \
 	OpenXPKI::Serialization::JSON.3 \
 	OpenXPKI::Serialization::Simple.3 \
 	OpenXPKI::Server.3 \
 	OpenXPKI::Server::ACL.3 \
 	OpenXPKI::Server::API.3 \
+	OpenXPKI::Server::API::Workflow.3 \
 	OpenXPKI::Server::Authentication.3 \
 	OpenXPKI::Server::Authentication::Anonymous.3 \
 	OpenXPKI::Server::Authentication::External.3 \
@@ -142,6 +158,7 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Server::Workflow::Activity::Request::Certificate::PKCS10::Create.3 \
 	OpenXPKI::Server::Workflow::Activity::Skeleton.3 \
 	OpenXPKI::Server::Workflow::Activity::Tools::DetermineIssuingCA.3 \
+	OpenXPKI::Server::Workflow::Condition::ACL.3 \
 	OpenXPKI::Server::Workflow::Persister::DBI.3 \
 	OpenXPKI::Server::Workflow::Persister::DBI::SequenceId.3 \
 	OpenXPKI::Server::Workflow::Validator::CertProfile.3 \
@@ -152,6 +169,10 @@ MAN3=	OpenXPKI.3 \
 	OpenXPKI::Service::Default.3 \
 	OpenXPKI::Service::Default::Command.3 \
 	OpenXPKI::Service::Default::Command::nop.3 \
+	OpenXPKI::Service::SCEP.3 \
+	OpenXPKI::Service::SCEP::Command.3 \
+	OpenXPKI::Service::SCEP::Command::GetCACert.3 \
+	OpenXPKI::Service::SCEP::Command::PKIOperation.3 \
 	OpenXPKI::Service::Test.3 \
 	OpenXPKI::Transport::Simple.3 \
 	OpenXPKI::VERSION.3 \
@@ -169,7 +190,8 @@ PERL_DIRS=	${SERVER} ${CLIENT}
 NO_PERL_DIRS=	${DEPLOYMENT} ${I18N}
 MAKE_MAKER_ENV=	PREFIX=${PREFIX}
 DESTDIR?=	/.
-CONFIGURE_ARGS=	--prefix ${PREFIX} --dest ${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:
@@ -205,6 +227,7 @@ post-install:
 		${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 6bc14eccfd47..7d56dc0b9cab 100644
--- a/security/p5-openxpki/distinfo
+++ b/security/p5-openxpki/distinfo
@@ -1,24 +1,24 @@
-MD5 (openxpki/OpenXPKI-0.9.402.tar.gz) = 7ada43d0bc6026ca19837f788950a650
-SHA256 (openxpki/OpenXPKI-0.9.402.tar.gz) = 6cfe06aa843d39153cf6e39d3bf02f7cc26db74d38e84c99b263c6ad9aa426a9
-SIZE (openxpki/OpenXPKI-0.9.402.tar.gz) = 190738
-MD5 (openxpki/OpenXPKI-Client-0.9.349.tar.gz) = 266f693234216b4f708105ff8e7afe42
-SHA256 (openxpki/OpenXPKI-Client-0.9.349.tar.gz) = ab708788c588e308263ca88ba4dbcb40b88547b95082483391e8c96f5663643a
-SIZE (openxpki/OpenXPKI-Client-0.9.349.tar.gz) = 12082
-MD5 (openxpki/OpenXPKI-Client-SCEP-0.9.342.tar.gz) = 80a61033a050d7c8b355e20a78f02769
-SHA256 (openxpki/OpenXPKI-Client-SCEP-0.9.342.tar.gz) = f93663fdd07618807a5043e49e61ecece707254ae20131ee0cb5dc4652082530
-SIZE (openxpki/OpenXPKI-Client-SCEP-0.9.342.tar.gz) = 4195
-MD5 (openxpki/OpenXPKI-Client-SOAP-Lite-0.9.342.tar.gz) = 93c886b24429ad2f6361c3675501535d
-SHA256 (openxpki/OpenXPKI-Client-SOAP-Lite-0.9.342.tar.gz) = 8865920270210100459c5e8a19900a1d1300e7134c05048a4a3b7427d1ce9505
-SIZE (openxpki/OpenXPKI-Client-SOAP-Lite-0.9.342.tar.gz) = 4190
-MD5 (openxpki/OpenXPKI-Client-CLI-0.9.389.tar.gz) = 0221962d6b6a4b273623ca4570422344
-SHA256 (openxpki/OpenXPKI-Client-CLI-0.9.389.tar.gz) = d6f01f2004d7266756abc24968bd4be238657c8893ff5ea57435a78932280f1d
-SIZE (openxpki/OpenXPKI-Client-CLI-0.9.389.tar.gz) = 10209
-MD5 (openxpki/OpenXPKI-Client-HTML-Mason-0.9.402.tar.gz) = c9a4663b88e307f7ef63568b36bdb4d8
-SHA256 (openxpki/OpenXPKI-Client-HTML-Mason-0.9.402.tar.gz) = 3975d26b2383f456384e4ef5a87cbb73fd40a15f5f88a20963eac1324de9bd0f
-SIZE (openxpki/OpenXPKI-Client-HTML-Mason-0.9.402.tar.gz) = 36320
-MD5 (openxpki/openxpki-deployment-0.9.402.tar.gz) = f9bc9e7e5ea882bb3b74c80a7ca1df8e
-SHA256 (openxpki/openxpki-deployment-0.9.402.tar.gz) = 4a023729bd46ddfca2b90cd65757a716fa0a22489707227c47ccb085e7e1172d
-SIZE (openxpki/openxpki-deployment-0.9.402.tar.gz) = 25159
-MD5 (openxpki/openxpki-i18n-0.9.402.tar.gz) = 55697be5eb98684acdf905e1fb0aa40e
-SHA256 (openxpki/openxpki-i18n-0.9.402.tar.gz) = 1db2cd51ceb7f5012325c0722c2ab1600c98ffe7bad388738d2ab5d715a57786
-SIZE (openxpki/openxpki-i18n-0.9.402.tar.gz) = 34487
+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
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index 16b912bc550a..7021a587bbaf 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -1,7 +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
@@ -11,6 +7,7 @@ bin/openxpkictl
 %%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
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL.xs
@@ -47,6 +44,7 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/PKCS10.xs
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/SPKAC.xs
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS/X509.xs
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CLI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CRL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CRR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/CSR.pm
@@ -56,18 +54,30 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/CRL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/Certificate.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Secret.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Secret/Plain.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Secret/Split.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/TokenManager.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/API.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/CLI.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_message_type.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command/get_transaction_id.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Engine/OpenSSL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Toolkit.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/VolatileVault.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/X509.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/DN.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/DateTime.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Debug.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Exception.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/FileUtils.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Serialization/JSON.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Serialization/Simple.pm
 %%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/Workflow.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/Anonymous.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication/External.pm
@@ -101,6 +111,7 @@ bin/openxpkictl
 %%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/DetermineIssuingCA.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Condition/ACL.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
@@ -111,6 +122,10 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default/Command.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default/Command/nop.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command/GetCACert.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command/PKIOperation.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Test.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Transport/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/VERSION.pm
@@ -127,24 +142,6 @@ bin/openxpkictl
 %%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_def_certificate_signing_request.xml
-%%DATADIR%%/templates/default/workflow_request_dataonly.xml
-%%DATADIR%%/templates/default/workflow_validator_certificate_signing_request.xml
-@dirrm %%DATADIR%%/templates/default
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SOAP/Lite
@@ -155,14 +152,18 @@ share/locale/en_GB/LC_MESSAGES/openxpki.mo
 @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%%/auto
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/XML
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Transport
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP/Command
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/SCEP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default/Command
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service/Default
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Service
 @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/Condition
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Request/Certificate/PKCS10
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Request/Certificate/DataOnly
@@ -180,8 +181,14 @@ share/locale/en_GB/LC_MESSAGES/openxpki.mo
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Authentication
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/API
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Serialization
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Engine
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP/Command
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool/SCEP
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Tool
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Secret
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/XS
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine
@@ -191,9 +198,9 @@ 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%%/%%PERL_ARCH%%
 @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
-@dirrmtry etc/openxpki