Attachment 222486 Details for Bug 253544 – patch to update two ports

[patch] patch to update two ports

ox.patch (text/plain), 9.66 KB, created by Sergei Vyshenski on 2021-02-16 12:18:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Vyshenski

Created: 2021-02-16 12:18:01 UTC

Size: 9.66 KB

patch

obsolete

>diff -ur security/p5-openxpki.orig/Makefile security/p5-openxpki/Makefile
>--- security/p5-openxpki.orig/Makefile	2020-10-24 23:05:48.000000000 +0300
>+++ security/p5-openxpki/Makefile	2021-02-16 14:11:38.010196000 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/security/p5-openxpki/Makefile 553226 2020-10-24 20:05:48Z lwhsu $
> 
> PORTNAME=	openxpki
>-PORTVERSION=	3.8.1
>+PORTVERSION=	3.10.2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security perl5
> PKGNAMEPREFIX=	p5-
>@@ -82,25 +82,23 @@
> 		p5-Test-Pod>=1.00:devel/p5-Test-Pod \
> 		p5-Test-Prereq>=0:devel/p5-Test-Prereq
> 
>-CONFLICTS=	p5-openxpki-client-[0-9]* \
>-		p5-openxpki-client-scep-[0-9]* \
>-		p5-openxpki-client-deployment-[0-9]* \
>-		p5-openxpki-client-html-mason-[0-9]*
>-
> USES=		gmake perl5 ssl
> USE_GITHUB=	yes
> GH_PROJECT=	openxpki-config:conf
>-conf_VERSION=	3.6
>-GH_TAGNAME=	${DISTVERSIONPREFIX}${conf_VERSION}:conf
>+GH_TAGNAME=	${DISTVERSIONPREFIX}${_conf_VERSION}:conf
>+_conf_VERSION=	3.10
> 
> USE_PERL5=	configure
>-NO_ARCH=	yes
> USE_RC_SUBR=	openxpki
>-SUB_FILES=	pkg-message
>-PORTDOCS=	*
>-PORTEXAMPLES=	*
> 
>+CONFLICTS=	p5-openxpki-client-[0-9]* \
>+		p5-openxpki-client-scep-[0-9]* \
>+		p5-openxpki-client-deployment-[0-9]* \
>+		p5-openxpki-client-html-mason-[0-9]*
>+
>+NO_ARCH=	yes
> PORTSCOUT=	limitw:1,even # stay with stable versions only
>+SUB_FILES=	pkg-message
> 
> # Workaround the bug in Mk/bsd.port.mk, cf. PR#246196:
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>@@ -109,6 +107,8 @@
> USERS=		openxpki
> GROUPS=		openxpki
> 
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
> OPTIONS_DEFINE=	GRAPHVIZ DOCS EXAMPLES
> 
> GRAPHVIZ_DESC=	With graphical visualization of workflows?
>@@ -139,13 +139,13 @@
> 	@${MKDIR} ${STAGEDIR}/var/log/openxpki
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/openxpki
> 
>+post-install-DOCS-on:
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC}/../../doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
>+
> post-install-EXAMPLES-on:
> 	${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})
> 
> .include <bsd.port.post.mk>
>diff -ur security/p5-openxpki.orig/distinfo security/p5-openxpki/distinfo
>--- security/p5-openxpki.orig/distinfo	2020-10-24 23:05:48.000000000 +0300
>+++ security/p5-openxpki/distinfo	2021-02-16 14:11:47.162093000 +0300
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1603451294
>-SHA256 (openxpki-openxpki-v3.8.1_GH0.tar.gz) = f899bdf3ad0eef75dac9563cb176adf3449a5d2d0776b0fd2523ea9a7d705053
>-SIZE (openxpki-openxpki-v3.8.1_GH0.tar.gz) = 34867372
>-SHA256 (openxpki-openxpki-config-v3.6_GH0.tar.gz) = 6640a47040c5c74c8627bf0094416e89f1e779c77ee911ebb7f1c44c28208b11
>-SIZE (openxpki-openxpki-config-v3.6_GH0.tar.gz) = 132553
>+TIMESTAMP = 1613473907
>+SHA256 (openxpki-openxpki-v3.10.2_GH0.tar.gz) = 0d3429cae9e598fe999e30e9de0edbd0a693f977e1fd1988fc353e69b8cab9c0
>+SIZE (openxpki-openxpki-v3.10.2_GH0.tar.gz) = 34961776
>+SHA256 (openxpki-openxpki-config-v3.10_GH0.tar.gz) = 00748b5e4ce9025ceddcbc65ecc4e76e25b71c607bf9ae176de371bd9287ece7
>+SIZE (openxpki-openxpki-config-v3.10_GH0.tar.gz) = 145308
>diff -ur security/p5-openxpki.orig/pkg-plist security/p5-openxpki/pkg-plist
>--- security/p5-openxpki.orig/pkg-plist	2020-10-24 23:05:48.000000000 +0300
>+++ security/p5-openxpki/pkg-plist	2021-02-16 14:09:36.058203000 +0300
>@@ -71,10 +71,11 @@
> %%PERL5_MAN3%%/OpenXPKI::Crypto::CLI.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::Profile::Base.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::Profile::CRL.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Crypto::Profile::CSR.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::Profile::Certificate.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Crypto::Secret.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::Secret::Plain.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Crypto::Secret::Split.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Crypto::SecretManager.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Crypto::SecretRole.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::TokenManager.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::Tool::CreateJavaKeystore.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Crypto::Tool::CreateJavaKeystore::API.3.gz
>@@ -116,6 +117,7 @@
> %%PERL5_MAN3%%/OpenXPKI::FileUtils.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Log4perl.3.gz
> %%PERL5_MAN3%%/OpenXPKI::MooseParams.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Password.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Random.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Serialization::Fast.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Serialization::JSON.3.gz
>@@ -313,6 +315,7 @@
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Reports::Detail.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Reports::GetList.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Reports::Summary.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Reports::Timeline.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Skeleton.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Skip.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Sleep.3.gz
>@@ -370,6 +373,7 @@
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::SetStatusMessage.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::StringToArray.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::TriggerCertificatePublish.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::UpdateContextHash.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::ValidateChallengePassword.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::WFArray.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Server::Workflow::Activity::Tools::WFHash.3.gz
>@@ -449,6 +453,7 @@
> %%PERL5_MAN3%%/OpenXPKI::Service::SCEP.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Service::SCEP::Command::PKIOperation.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Template.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Template::Plugin::Alias.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Template::Plugin::Certificate.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Template::Plugin::CheckDNS.3.gz
> %%PERL5_MAN3%%/OpenXPKI::Template::Plugin::DateTime.3.gz
>@@ -543,10 +548,11 @@
> %%SITE_PERL%%/OpenXPKI/Crypto/CLI.pm
> %%SITE_PERL%%/OpenXPKI/Crypto/Profile/Base.pm
> %%SITE_PERL%%/OpenXPKI/Crypto/Profile/CRL.pm
>+%%SITE_PERL%%/OpenXPKI/Crypto/Profile/CSR.pm
> %%SITE_PERL%%/OpenXPKI/Crypto/Profile/Certificate.pm
>-%%SITE_PERL%%/OpenXPKI/Crypto/Secret.pm
> %%SITE_PERL%%/OpenXPKI/Crypto/Secret/Plain.pm
>-%%SITE_PERL%%/OpenXPKI/Crypto/Secret/Split.pm
>+%%SITE_PERL%%/OpenXPKI/Crypto/SecretManager.pm
>+%%SITE_PERL%%/OpenXPKI/Crypto/SecretRole.pm
> %%SITE_PERL%%/OpenXPKI/Crypto/TokenManager.pm
> %%SITE_PERL%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore.pm
> %%SITE_PERL%%/OpenXPKI/Crypto/Tool/CreateJavaKeystore/API.pm
>@@ -593,6 +599,7 @@
> %%SITE_PERL%%/OpenXPKI/FileUtils.pm
> %%SITE_PERL%%/OpenXPKI/Log4perl.pm
> %%SITE_PERL%%/OpenXPKI/MooseParams.pm
>+%%SITE_PERL%%/OpenXPKI/Password.pm
> %%SITE_PERL%%/OpenXPKI/Random.pm
> %%SITE_PERL%%/OpenXPKI/SOAP.pm
> %%SITE_PERL%%/OpenXPKI/SOAP/Revoke.pm
>@@ -793,6 +800,7 @@
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Reports/Detail.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Reports/GetList.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Reports/Summary.pm
>+%%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Reports/Timeline.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Skeleton.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Skip.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Sleep.pm
>@@ -853,6 +861,7 @@
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Tools/StringToArray.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Tools/TriggerCertificatePublish.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Tools/UpdateCertificateMetadata.pm
>+%%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Tools/UpdateContextHash.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Tools/ValidateChallengePassword.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Tools/WFArray.pm
> %%SITE_PERL%%/OpenXPKI/Server/Workflow/Activity/Tools/WFHash.pm
>@@ -938,6 +947,7 @@
> %%SITE_PERL%%/OpenXPKI/Service/SCEP/Command/GetNextCACert.pm
> %%SITE_PERL%%/OpenXPKI/Service/SCEP/Command/PKIOperation.pm
> %%SITE_PERL%%/OpenXPKI/Template.pm
>+%%SITE_PERL%%/OpenXPKI/Template/Plugin/Alias.pm
> %%SITE_PERL%%/OpenXPKI/Template/Plugin/Certificate.pm
> %%SITE_PERL%%/OpenXPKI/Template/Plugin/CheckDNS.pm
> %%SITE_PERL%%/OpenXPKI/Template/Plugin/DateTime.pm
>diff -ur security/p5-openxpki-i18n.orig/Makefile security/p5-openxpki-i18n/Makefile
>--- security/p5-openxpki-i18n.orig/Makefile	2020-10-24 23:05:48.000000000 +0300
>+++ security/p5-openxpki-i18n/Makefile	2021-02-16 14:11:59.001899000 +0300
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/security/p5-openxpki-i18n/Makefile 553226 2020-10-24 20:05:48Z lwhsu $
> 
> PORTNAME=	openxpki
>-PORTVERSION=	3.8.1
>+PORTVERSION=	3.10.2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security perl5
> PKGNAMEPREFIX=	p5-
>@@ -14,8 +14,6 @@
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/../../LICENSE
> 
>-PORTSCOUT=	limitw:1,even # stay with stable versions only
>-
> ### We can not go without NLS. Internationalization is needed even for English
> USES=		gettext-runtime gettext-tools gmake perl5
> 
>@@ -23,6 +21,8 @@
> 
> ALL_TARGET=	scan default
> NO_ARCH=	yes
>+PORTSCOUT=	limitw:1,even # stay with stable versions only
>+
> WRKSRC_SUBDIR=	core/i18n
> 
> .include <bsd.port.mk>
>diff -ur security/p5-openxpki-i18n.orig/distinfo security/p5-openxpki-i18n/distinfo
>--- security/p5-openxpki-i18n.orig/distinfo	2020-10-24 23:05:48.000000000 +0300
>+++ security/p5-openxpki-i18n/distinfo	2021-02-16 14:12:01.421929000 +0300
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1603451336
>-SHA256 (openxpki-openxpki-v3.8.1_GH0.tar.gz) = f899bdf3ad0eef75dac9563cb176adf3449a5d2d0776b0fd2523ea9a7d705053
>-SIZE (openxpki-openxpki-v3.8.1_GH0.tar.gz) = 34867372
>+TIMESTAMP = 1613473921
>+SHA256 (openxpki-openxpki-v3.10.2_GH0.tar.gz) = 0d3429cae9e598fe999e30e9de0edbd0a693f977e1fd1988fc353e69b8cab9c0
>+SIZE (openxpki-openxpki-v3.10.2_GH0.tar.gz) = 34961776

Flags:

svysh.fbsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 253544: 222476 | 222486 | 223451 | 224480 | 224481