Attachment 152781 Details for Bug 197470 – patch for updating port

[patch] patch for updating port

ox.patch (text/plain), 12.43 KB, created by Sergei Vyshenski on 2015-02-08 22:17:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Vyshenski

Created: 2015-02-08 22:17:26 UTC

Size: 12.43 KB

patch

obsolete

>diff -ur security/p5-openxpki.orig/Makefile security/p5-openxpki/Makefile
>--- security/p5-openxpki.orig/Makefile	2014-12-16 14:45:53.000000000 +0100
>+++ security/p5-openxpki/Makefile	2015-02-08 21:26:50.000000000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/security/p5-openxpki/Makefile 374805 2014-12-16 13:45:53Z mat $
> 
> PORTNAME=	openxpki
>-PORTVERSION=	0.25.0.1
>-PORTREVISION=	1
>+PORTVERSION=	0.26.1.1
> CATEGORIES=	security perl5
> PKGNAMEPREFIX=	p5-
> DIST_SUBDIR=	openxpki
>@@ -14,6 +13,7 @@
> LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	\
>+	p5-Math-BigInt>=1.9993:${PORTSDIR}/math/p5-Math-BigInt \
> 	p5-Test-Prereq>=0:${PORTSDIR}/devel/p5-Test-Prereq \
> 	p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike \
> 	p5-openxpki-i18n>=0.20.0.1:${PORTSDIR}/security/p5-openxpki-i18n \
>@@ -75,7 +75,7 @@
> GH_ACCOUNT=	openxpki
> GH_PROJECT=	openxpki
> GH_TAGNAME=	${GH_COMMIT}
>-GH_COMMIT=	2f83048
>+GH_COMMIT=	9bd1fea
> 
> USE_OPENSSL=	yes
> USE_PERL5=	configure
>@@ -101,13 +101,14 @@
> 	@${RM} -f ${WRKSRC}/Makefile.PL.bak
> 	@( \
> 	cd ${WRKSRC}/../..; \
>-	for f in `${FIND} config core/server doc qatest tools -type f ! -path "core/server/t/*"`; do \
>-		${REINPLACE_CMD} -e 's|/etc/openxpki|${PREFIX}/etc/openxpki|g' $${f}; \
>-		${REINPLACE_CMD} -e 's|/var/run/openxpkid.pid|/var/openxpki/openxpkid.pid|g' $${f}; \
>-		${REINPLACE_CMD} -e 's|/var/openxpki/$[^\.]*$\.log|/var/log/openxpki/\1\.log|g' $${f}; \
>-		${RM} -f $${f}.bak; \
>-	done \
>+	${FIND} config core/server doc qatest tools -type f -print0 >filelist; \
>+	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/etc/openxpki|${PREFIX}/etc/openxpki|g' "%"; \
>+	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/var/run/openxpkid.pid|/var/openxpki/openxpkid.pid|g' "%"; \
>+	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/var/openxpki/$[^\.]*$\.log|/var/log/openxpki/\1\.log|g' "%"; \
>+	${CAT} filelist | ${XARGS} -0 -I % ${RM} -f "%.bak"; \
>+	${RM} filelist; \
> 	)
>+	@${MKDIR} ${WRKSRC}/t/var/log/openxpki
> 
> post-stage:
> 	@${MKDIR} ${STAGEDIR}/var/openxpki
>diff -ur security/p5-openxpki.orig/distinfo security/p5-openxpki/distinfo
>--- security/p5-openxpki.orig/distinfo	2014-12-04 16:23:44.000000000 +0100
>+++ security/p5-openxpki/distinfo	2015-02-07 23:05:39.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (openxpki/openxpki-0.25.0.1.tar.gz) = 6ef66933457488488b6bccfed4d7cc835d445d0482aeb54de950eca5066df35a
>-SIZE (openxpki/openxpki-0.25.0.1.tar.gz) = 2038200
>+SHA256 (openxpki/openxpki-0.26.1.1.tar.gz) = 4bc3cefeafa23e002f763278dd48a21d31ce583221c4e8072cbf46206804d583
>+SIZE (openxpki/openxpki-0.26.1.1.tar.gz) = 2048267
>diff -ur security/p5-openxpki.orig/pkg-plist security/p5-openxpki/pkg-plist
>--- security/p5-openxpki.orig/pkg-plist	2014-12-04 16:23:44.000000000 +0100
>+++ security/p5-openxpki/pkg-plist	2015-02-08 22:18:22.000000000 +0100
>@@ -25,6 +25,7 @@
> %%SITE_ARCH%%/OpenXPKI/Config/Backend.pm
> %%SITE_ARCH%%/OpenXPKI/Config/Merge.pm
> %%SITE_ARCH%%/OpenXPKI/Config/Test.pm
>+%%SITE_ARCH%%/OpenXPKI/Connector/DataPool.pm
> %%SITE_ARCH%%/OpenXPKI/Connector/FakeValidity.pm
> %%SITE_ARCH%%/OpenXPKI/Control.pm
> %%SITE_ARCH%%/OpenXPKI/Crypto/API.pm
>@@ -173,7 +174,6 @@
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GenerateKey.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/GeneratePKCS10.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CSR/PersistRequest.pm
>-%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertIssuance/PublishCertificate.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/CertRenewal/FetchOrgCertData.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/CheckForRevocation.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/NICE/FetchCertificate.pm
>@@ -207,7 +207,6 @@
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GeneratePUK.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/GetOwnerByCardID.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/PersistCSRs.pm
>-%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/PublishCertificate.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/SmartCard/RenameEscrowedKey.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Test.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Approve.pm
>@@ -224,12 +223,14 @@
> %%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/ListActiveToken.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/LoadCertificateMetadata.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Notify.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ParseCertificate.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/ParsePKCS10.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/Pause.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PersistCertificateMetadata.pm
>+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PublishCA.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PublishCRL.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/PublishCertificate.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/RenderSubject.pm
>@@ -238,6 +239,7 @@
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/SetContext.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
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/UpdateCertificateMetadata.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/WFArray.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Activity/Tools/WFHash.pm
>@@ -258,6 +260,7 @@
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Condition/HasRole.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
>@@ -280,6 +283,7 @@
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Pause.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Persister/DBI/SequenceId.pm
>+%%SITE_ARCH%%/OpenXPKI/Server/Workflow/Persister/Null.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Stub.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/ApprovalSignature.pm
> %%SITE_ARCH%%/OpenXPKI/Server/Workflow/Validator/Bulk.pm
>@@ -336,13 +340,16 @@
> %%PERL5_MAN3%%/OpenXPKI::Client::Simple.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Client::UI.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Client::UI::Certificate.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Client::UI::Crl.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Client::UI::Home.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Client::UI::Information.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Client::UI::Result.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Client::UI::Workflow.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Config.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Config::Backend.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Config::Merge.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Config::Test.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Connector::DataPool.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Connector::FakeValidity.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Control.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::API.3.gz
>@@ -483,7 +490,6 @@
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::CSR::GenerateKey.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::CSR::GeneratePKCS10.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::CSR::PersistRequest.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::CertIssuance::PublishCertificate.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::CertRenewal::FetchOrgCertData.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::NICE::CheckForRevocation.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::NICE::FetchCertificate.3.gz
>@@ -517,7 +523,6 @@
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::SmartCard::GeneratePUK.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::SmartCard::GetOwnerByCardID.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::SmartCard::PersistCSRs.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::SmartCard::PublishCertificate.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::SmartCard::RenameEscrowedKey.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Approve.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::CalculateKeyId.3.gz
>@@ -533,10 +538,12 @@
> %%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::ListActiveToken.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Notify.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::ParseCertificate.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::ParsePKCS10.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::Pause.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::PublishCA.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::PublishCRL.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::PublishCertificate.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::RenderSubject.3.gz
>@@ -545,6 +552,7 @@
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::SetContext.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
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::WFArray.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::WFHash.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Transfer::SCP.3.gz
>@@ -564,6 +572,7 @@
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Condition::HasRole.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
>@@ -585,6 +594,7 @@
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Pause.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Persister::DBI.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Persister::DBI::SequenceId.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Persister::Null.3.gz
> %%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
>@@ -705,6 +715,11 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/profile/template.yaml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/publishing.yaml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/scep/scep-server-1.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/uicontrol/Anonymous.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/uicontrol/CA Operator.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/uicontrol/RA Operator.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/uicontrol/_default.yaml
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/workflow/def/ca_publish.yaml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/workflow/def/certificate_export.yaml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/workflow/def/certificate_publishing.yaml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openxpki/config.d/realm/ca-one/workflow/def/certificate_revocation_request_v2.yaml
>@@ -778,9 +793,9 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/profiles/I18N_OPENXPKI_PROFILE_SCEP_CLIENT.yaml
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampleconfig.sh
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql/schema-mysql.sql
>-@owner openxpki
>-@group openxpki
> @dir %%ETCDIR%%
> @dir /var/log/openxpki
> @dir /var/openxpki/session
> @dir /var/openxpki
>+@owner openxpki
>+@group openxpki

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 197470: 152781 | 152782 | 153096 | 153097