3 files changed, 169 insertions, 134 deletions

diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index bb7c3f5ec5d7..4266e8a65c1b 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	openxpki
-PORTVERSION=	0.9.342
-PORTREVISION=	1
+PORTVERSION=	0.9.402
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	openxpki
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	p5-
+DISTFILES=	${SERVER} ${CLIENT} ${DEPLOYMENT} ${I18N}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	svysh@cryptocom.ru
 COMMENT=	Perl based enterprise class trastcenter software for PKI
@@ -35,176 +36,176 @@ BUILD_DEPENDS=	\
 	${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
 MAN1=	openxpki-configure.1 \
 	openxpki-metaconf.1 \
 	openxpkiadm.1 \
 	openxpkictl.1
-
-MAN3=	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key.3 \
-	OpenXPKI::Server::Session.3 \
-	OpenXPKI::Service::Default.3 \
-	OpenXPKI::Server::DBI::Driver.3 \
-	OpenXPKI::Server::Authentication::External.3 \
-	OpenXPKI::Transport::Simple.3 \
+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::Backend::API.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::CLI.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_cert.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_crl.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_key.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_pkcs10.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_cert.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::GOST94.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::RSA.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_pkcs10.3 \
-	OpenXPKI::Server::DBI::Driver::DB2.3 \
-	OpenXPKI::Server::Workflow::Activity.3 \
-	OpenXPKI::Crypto::Profile::Base.3 \
-	OpenXPKI::Service::Default::Command.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_pkcs12.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_random.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 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_encrypt.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_get_chain.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_sign.3 \
-	OpenXPKI::Server::API.3 \
-	OpenXPKI::Crypto::CRL.3 \
-	OpenXPKI::Serialization::JSON.3 \
-	OpenXPKI::Server::Workflow::Activity::Passphrase::Generate.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_verify.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Command::symmetric_cipher.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Config.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Engine.3 \
-	OpenXPKI.3 \
-	OpenXPKI::Server::DBI.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Engine::GOST.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::Engine::OpenSSL.3 \
 	OpenXPKI::Crypto::Backend::OpenSSL::Engine::nCipher.3 \
-	OpenXPKI::Server::DBI::Driver::PostgreSQL.3 \
-	OpenXPKI::XML::Config.3 \
-	OpenXPKI::Server::ACL.3 \
-	OpenXPKI::XML::Cache.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::DSA.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_cert.3 \
-	OpenXPKI::Server::DBI::Hash.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Config.3 \
-	OpenXPKI::Server::Init.3 \
+	OpenXPKI::Crypto::Backend::OpenSSL::XS.3 \
+	OpenXPKI::Crypto::CRL.3 \
+	OpenXPKI::Crypto::CRR.3 \
 	OpenXPKI::Crypto::CSR.3 \
-	OpenXPKI::Server::DBI::Schema.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_pkcs12.3 \
+	OpenXPKI::Crypto::Header.3 \
 	OpenXPKI::Crypto::Object.3 \
-	OpenXPKI::Service::Default::Command::nop.3 \
-	OpenXPKI::Server::Authentication::Anonymous.3 \
+	OpenXPKI::Crypto::PKCS7.3 \
+	OpenXPKI::Crypto::Profile::Base.3 \
+	OpenXPKI::Crypto::Profile::CRL.3 \
 	OpenXPKI::Crypto::Profile::Certificate.3 \
-	OpenXPKI::Crypto::Backend::API.3 \
-	OpenXPKI::Server::Authentication::LDAP.3 \
-	OpenXPKI::Exception.3 \
+	OpenXPKI::Crypto::TokenManager.3 \
+	OpenXPKI::Crypto::VolatileVault.3 \
 	OpenXPKI::Crypto::X509.3 \
-	OpenXPKI::Server::DBI::Object.3 \
+	OpenXPKI::DN.3 \
+	OpenXPKI::DateTime.3 \
 	OpenXPKI::Debug.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_get_chain.3 \
-	OpenXPKI::VERSION.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_verify.3 \
+	OpenXPKI::Exception.3 \
+	OpenXPKI::Serialization::JSON.3 \
+	OpenXPKI::Serialization::Simple.3 \
 	OpenXPKI::Server.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Engine::GOST.3 \
-	OpenXPKI::Server::Workflow::Persister::DBI.3 \
-	OpenXPKI::Service.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::XS.3 \
-	OpenXPKI::Server::Workflow::Activity::Tools::DetermineIssuingCA.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::EC.3 \
-	OpenXPKI::Server::Workflow::Activity::Skeleton.3 \
-	OpenXPKI::Server::Workflow::Persister::DBI::SequenceId.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_decrypt.3 \
-	OpenXPKI::Server::Workflow::Activity::Request::Certificate::PKCS10::Create.3 \
-	OpenXPKI::Server::Log::Appender::DBI.3 \
-	OpenXPKI::i18n.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_pkcs10.3 \
-	OpenXPKI::Server::DBI::SQL.3 \
-	OpenXPKI::Server::Workflow::Activity::Certificate::Issue.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_cert.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::RSA.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::issue_crl.3 \
+	OpenXPKI::Server::ACL.3 \
+	OpenXPKI::Server::API.3 \
+	OpenXPKI::Server::Authentication.3 \
+	OpenXPKI::Server::Authentication::Anonymous.3 \
+	OpenXPKI::Server::Authentication::External.3 \
+	OpenXPKI::Server::Authentication::LDAP.3 \
+	OpenXPKI::Server::Authentication::Password.3 \
+	OpenXPKI::Server::Authentication::X509.3 \
+	OpenXPKI::Server::Context.3 \
+	OpenXPKI::Server::DBI.3 \
 	OpenXPKI::Server::DBI::DBH.3 \
+	OpenXPKI::Server::DBI::Driver.3 \
+	OpenXPKI::Server::DBI::Driver::DB2.3 \
 	OpenXPKI::Server::DBI::Driver::MySQL.3 \
-	OpenXPKI::Crypto::Profile::CRL.3 \
-	OpenXPKI::Server::Workflow::Activity::Profile::Create.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::issue_cert.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 \
 	OpenXPKI::Server::Log.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_key.3 \
-	OpenXPKI::Server::Authentication::X509.3 \
+	OpenXPKI::Server::Log::Appender::DBI.3 \
+	OpenXPKI::Server::Session.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::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::Crypto::Backend::OpenSSL::Engine::OpenSSL.3 \
-	OpenXPKI::Server::Authentication::Password.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::CLI.3 \
-	OpenXPKI::Crypto::Header.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::convert_crl.3 \
-	OpenXPKI::Server::Workflow.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::Persister::DBI.3 \
+	OpenXPKI::Server::Workflow::Persister::DBI::SequenceId.3 \
+	OpenXPKI::Server::Workflow::Validator::CertProfile.3 \
+	OpenXPKI::Server::Workflow::Validator::CertSubject.3 \
+	OpenXPKI::Server::Workflow::Validator::CertSubjectAltName.3 \
+	OpenXPKI::Server::Workflow::Validator::SPKAC.3 \
+	OpenXPKI::Service.3 \
+	OpenXPKI::Service::Default.3 \
+	OpenXPKI::Service::Default::Command.3 \
+	OpenXPKI::Service::Default::Command::nop.3 \
 	OpenXPKI::Service::Test.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::pkcs7_encrypt.3 \
-	OpenXPKI::DN.3 \
-	OpenXPKI::DateTime.3 \
-	OpenXPKI::Crypto::TokenManager.3 \
-	OpenXPKI::Crypto::CRR.3 \
-	OpenXPKI::Crypto::PKCS7.3 \
-	OpenXPKI::Server::Authentication.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_key::GOST94.3 \
-	OpenXPKI::Server::DBI::Driver::SQLite.3 \
-	OpenXPKI::Serialization::Simple.3 \
-	OpenXPKI::Crypto::Backend::OpenSSL::Command::create_random.3 \
-	OpenXPKI::Server::Context.3 \
-	OpenXPKI::Client::API.3 \
-	OpenXPKI::Client.3 \
-	OpenXPKI::Client::CLI.3 \
-	OpenXPKI::Client::SOAP::Lite.3 \
-	OpenXPKI::Client::HTML::Mason.3 \
-	OpenXPKI::Client::HTML::Mason::Config.3
-
+	OpenXPKI::Transport::Simple.3 \
+	OpenXPKI::VERSION.3 \
+	OpenXPKI::XML::Cache.3 \
+	OpenXPKI::XML::Config.3 \
+	OpenXPKI::i18n.3
 USE_PERL5=	yes
-USE_BZIP2=	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
-
-SERVER_DIRS=	perl-modules
-CLIENT_DIRS=	clients/perl/OpenXPKI-Client \
-		clients/perl/OpenXPKI-Client-CLI \
-		clients/perl/OpenXPKI-Client-SOAP-Lite \
-		clients/perl/OpenXPKI-Client-HTML-Mason
-
-DEPLOYMENT_DIRS=deployment
-PERL_DIRS=	${SERVER_DIRS} ${CLIENT_DIRS}
-NO_PERL_DIRS=	${DEPLOYMENT_DIRS}
-POST_DIRS=	${CLIENT_DIRS} ${DEPLOYMENT_DIRS}
+PERL_DIRS=	${SERVER} ${CLIENT}
+NO_PERL_DIRS=	${DEPLOYMENT} ${I18N}
 MAKE_MAKER_ENV=	PREFIX=${PREFIX}
-CONFIGURE_ARGS=	--prefix ${PREFIX}
+DESTDIR?=	/
+CONFIGURE_ARGS=	--prefix ${PREFIX} --dest ${DESTDIR}
 MAN1PREFIX=	${PREFIX}
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|admgroup:\( *\)root|admgroup:\1wheel|g' \
-		${WRKSRC}/deployment/etc/templates/default/openxpki.conf.in
-	@${REINPLACE_CMD} -e \
-	's|CFG\( *\)=\( *\)openxpki-metaconf|CFG\1=\2bin/openxpki-metaconf|g' \
-	${WRKSRC}/deployment/Makefile.in
-
 do-configure:
-	@ cd ${WRKSRC}/perl-modules && ${ECHO} "342" > revision
 	@ for dir in ${PERL_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && \
-		${ECHO} "DIR= $${dir}" && ${PERL} Makefile.PL ${MAKE_MAKER_ENV}; \
+		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 \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
+		dir="`${ECHO} $${dir} | ${SED} -e 's/.tar.gz//'`"; \
+		cd ${WRKDIR}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
 do-install:
 	@ for dir in ${PERL_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && \
+		dir="`${ECHO} $${dir} | ${SED} -e 's/.tar.gz//'`"; \
+		cd ${WRKDIR}/$${dir} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
 
 post-install:
 	${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 	@ for dir in ${NO_PERL_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && \
+		dir="`${ECHO} $${dir} | ${SED} -e 's/.tar.gz//'`"; \
+		cd ${WRKDIR}/$${dir} && \
 		${ECHO} "DIR= $${dir}" && \
-		${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && \
+		if [ -f ./${CONFIGURE_SCRIPT} ]; then \
+			${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
+		fi && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}; \
 	done
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/docs/architecture/whitepapers/OpenXPKI-Architecture-Overview.pdf \
-		${DOCSDIR}
-	@${ECHO_MSG} "===>   Documents intstalled in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/p5-openxpki/distinfo b/security/p5-openxpki/distinfo
index ee093353c95e..6bc14eccfd47 100644
--- a/security/p5-openxpki/distinfo
+++ b/security/p5-openxpki/distinfo
@@ -1,3 +1,24 @@
-MD5 (openxpki-0.9.342.tar.bz2) = 50882d99ad8e90e6515408678f2b802b
-SHA256 (openxpki-0.9.342.tar.bz2) = 51b4bc45b922e7e062297c2c9b321320ae2b270a7a99c5e84f0c81c7f8ca9576
-SIZE (openxpki-0.9.342.tar.bz2) = 435924
+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
diff --git a/security/p5-openxpki/pkg-plist b/security/p5-openxpki/pkg-plist
index b7c86feaf6b4..16b912bc550a 100644
--- a/security/p5-openxpki/pkg-plist
+++ b/security/p5-openxpki/pkg-plist
@@ -6,9 +6,9 @@ bin/openxpkictl
 %%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/Config.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/Backend/API.pm
@@ -36,6 +36,7 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_get_chain.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_sign.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/pkcs7_verify.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Command/symmetric_cipher.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Config.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Backend/OpenSSL/Engine/GOST.pm
@@ -56,6 +57,7 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/CRL.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/Profile/Certificate.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Crypto/TokenManager.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
@@ -88,6 +90,7 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log/Appender/DBI.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Session.pm
+%%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
@@ -100,6 +103,10 @@ bin/openxpkictl
 %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/DetermineIssuingCA.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/CertSubject.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/CertSubjectAltName.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Validator/SPKAC.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
@@ -114,9 +121,12 @@ bin/openxpkictl
 %%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
@@ -127,16 +137,19 @@ bin/openxpkictl
 %%DATADIR%%/templates/default/token.xml
 %%DATADIR%%/templates/default/workflow.xml
 %%DATADIR%%/templates/default/workflow_activity.xml
-%%DATADIR%%/templates/default/workflow_persister.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
-@dirrm var/openxpki/session
-@dirrm var/openxpki
-@dirrmtry var
+%%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
 @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
@@ -147,6 +160,7 @@ bin/openxpkictl
 @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/Activity/Tools
@@ -160,6 +174,7 @@ bin/openxpkictl
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Workflow/Activity/Certificate
 @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
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log/Appender
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/Log
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OpenXPKI/Server/DBI/Driver
@@ -182,5 +197,3 @@ bin/openxpkictl
 @dirrm %%SITE_PERL%%/OpenXPKI/Client
 @dirrm %%SITE_PERL%%/OpenXPKI
 @dirrmtry etc/openxpki
-%%PORTDOCS%%%%DOCSDIR%%/OpenXPKI-Architecture-Overview.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%