Attachment 144148 Details for Bug 191393 – patch to fix problem

[patch] patch to fix problem

ma.diff (text/plain), 12.88 KB, created by Sergei Vyshenski on 2014-06-26 08:59:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Vyshenski

Created: 2014-06-26 08:59:40 UTC

Size: 12.88 KB

patch

obsolete

>diff -urN security/p5-openxpki-client-html-mason.orig/Makefile security/p5-openxpki-client-html-mason/Makefile
>--- security/p5-openxpki-client-html-mason.orig/Makefile	2014-04-11 13:21:38.000000000 +0400
>+++ security/p5-openxpki-client-html-mason/Makefile	2014-06-25 12:44:13.000000000 +0400
>@@ -1,28 +1,38 @@
>-# Created by: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
>+# Created by: Sergei Vyshenski <svysh.fbsd@gmail.com>
> # $FreeBSD: head/security/p5-openxpki-client-html-mason/Makefile 350912 2014-04-11 09:21:38Z sunpoet $
> 
> PORTNAME=	openxpki-client-html-mason
>-PORTVERSION=	0.9.1396
>+PORTVERSION=	0.14.0.1
> CATEGORIES=	security perl5
>-MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
> PKGNAMEPREFIX=	p5-
>-DISTNAME=	OpenXPKI-Client-HTML-Mason-${PORTVERSION}
>+DISTNAME=	openxpki-${PORTVERSION}
> DIST_SUBDIR=	openxpki
> 
> MAINTAINER=	svysh.fbsd@gmail.com
> COMMENT=	Web interface for local openxpki daemon
> 
>-OPTIONS_DEFINE=	DOCS EXAMPLES
>+LICENSE=	APACHE20
> 
> BUILD_DEPENDS=	\
>-	p5-openxpki-client>=0:${PORTSDIR}/security/p5-openxpki-client \
>+	p5-openxpki>=0.14:${PORTSDIR}/security/p5-openxpki \
> 	p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \
> 	p5-Data-SpreadPagination>=0:${PORTSDIR}/textproc/p5-Data-SpreadPagination
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	openxpki
>+GH_PROJECT=	openxpki
>+GH_TAGNAME=	${GH_COMMIT}
>+GH_COMMIT=	66ee052
>+
> USES=		gmake perl5
> USE_PERL5=	configure
> 
>+WRKSRC=	${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/clients/perl/OpenXPKI-Client-HTML-Mason
>+
>+pre-patch:
>+	(cd ${WRKSRC} && ${FIND} ./* > MANIFEST)
>+
> post-install:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${CP} -R ${WRKSRC}/htdocs ${STAGEDIR}${DOCSDIR}/
>@@ -32,9 +42,6 @@
> 	@${ECHO_MSG} "===> installed in ${DOCSDIR}"
> 	@${ECHO_MSG} "==================================================================="
> 	@${ECHO_MSG} ""
>-.if !defined(BATCH)
>-	@sleep 3
>-.endif
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	${CP} -R ${WRKSRC}/eg ${STAGEDIR}${EXAMPLESDIR}/
> 	@${ECHO_MSG} ""
>@@ -43,9 +50,6 @@
> 	@${ECHO_MSG} "===> installed in ${EXAMPLESDIR}"
> 	@${ECHO_MSG} "==================================================================="
> 	@${ECHO_MSG} ""
>-.if !defined(BATCH)
>-	@sleep 3
>-.endif
> 	${MKDIR} ${STAGEDIR}${DATADIR}
> 	${CP} -R ${WRKSRC}/bin ${STAGEDIR}${DATADIR}/
> 	@${ECHO_MSG} ""
>@@ -55,7 +59,7 @@
> 	@${ECHO_MSG} "==================================================================="
> 	@${ECHO_MSG} ""
> .if !defined(BATCH)
>-	@sleep 3
>+	@sleep 9
> .endif
> 
> .include <bsd.port.mk>
>diff -urN security/p5-openxpki-client-html-mason.orig/distinfo security/p5-openxpki-client-html-mason/distinfo
>--- security/p5-openxpki-client-html-mason.orig/distinfo	2014-01-22 19:30:13.000000000 +0400
>+++ security/p5-openxpki-client-html-mason/distinfo	2014-06-23 21:53:23.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (openxpki/OpenXPKI-Client-HTML-Mason-0.9.1396.tar.gz) = 51538e1c07d9a40bf47f2e82a7d210afd13af073e5c0ee086f474624ffea4834
>-SIZE (openxpki/OpenXPKI-Client-HTML-Mason-0.9.1396.tar.gz) = 179059
>+SHA256 (openxpki/openxpki-0.14.0.1.tar.gz) = cd55fa6790910ee9239ebcf4e5dfbe9ea5f5fded06474a145f75092d646ef8b3
>+SIZE (openxpki/openxpki-0.14.0.1.tar.gz) = 2805627
>diff -urN security/p5-openxpki-client-html-mason.orig/files/patch-Makefile.PL security/p5-openxpki-client-html-mason/files/patch-Makefile.PL
>--- security/p5-openxpki-client-html-mason.orig/files/patch-Makefile.PL	1970-01-01 03:00:00.000000000 +0300
>+++ security/p5-openxpki-client-html-mason/files/patch-Makefile.PL	2014-06-23 22:49:58.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- ./Makefile.PL.orig	2014-05-26 21:09:27.000000000 +0400
>++++ ./Makefile.PL	2014-06-23 22:49:53.000000000 +0400
>+@@ -7,7 +7,7 @@
>+ my $version;
>+ 
>+ if ( -e($vergen) ) {
>+-    $version = `$vergen --format version`;                                                                                                                 
>++    $version = "0.14.0";                                                                                                                 
>+ 
>+     if ($CHILD_ERROR == 0) {
>+         print "Version $version\n";
>diff -urN security/p5-openxpki-client-html-mason.orig/pkg-descr security/p5-openxpki-client-html-mason/pkg-descr
>--- security/p5-openxpki-client-html-mason.orig/pkg-descr	2014-01-22 19:44:51.000000000 +0400
>+++ security/p5-openxpki-client-html-mason/pkg-descr	2014-06-25 12:42:47.000000000 +0400
>@@ -1,21 +1,14 @@
> 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: server part and deployment tools
> p5-openxpki-i18n: internationalization of the user interface
> p5-openxpki-client-html-mason: web interface to local OpenXPKI daemon
>-p5-openxpki-client-scep: set of SCEP 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-html-mason,
>-             \--> |  p5-openxpki-client-scep, p5-openxpki-deployment.
>-Notes: 
>-I18n is needed for the English interface too. For effective use of deployment,
>-it is recommended to install p5-openxpki-client-html-mason.
>+  p5-openxpki-client-html-mason  <--  p5-openxpki  -->  p5-openxpki-i18n
> 
>-WWW: http://www.openxpki.org/download/freebsd.html
>+Notes: I18n is needed for the English interface too. 
>+
>+WWW: http://www.openxpki.org/
>diff -urN security/p5-openxpki-client-html-mason.orig/pkg-plist security/p5-openxpki-client-html-mason/pkg-plist
>--- security/p5-openxpki-client-html-mason.orig/pkg-plist	2014-04-11 13:21:38.000000000 +0400
>+++ security/p5-openxpki-client-html-mason/pkg-plist	2014-06-24 18:51:25.000000000 +0400
>@@ -1,3 +1,9 @@
>+%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::ApacheHandler.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::CRR.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::Config.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::Javascript.3.gz
>+%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::Menu.3.gz
> %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason.pm
> %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason/ApacheHandler.pm
> %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason/CRR.pm
>@@ -5,11 +11,6 @@
> %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason/Javascript.pm
> %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason/Menu.pm
> %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML/Mason/.packlist
>-%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::CRR.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::Config.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::Javascript.3.gz
>-%%PERL5_MAN3%%/OpenXPKI::Client::HTML::Mason::Menu.3.gz
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/Menu/Query/index.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/Renderer/Command/default.mhtml
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/Renderer/Service/GET_AUTHENTICATION_STACK.mhtml
>@@ -30,7 +31,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/authentication/x509.mhtml
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/authentication/x509_webserver.mhtml
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/autohandler
>-%%PORTDOCS%%%%DOCSDIR%%/htdocs/binary/autohandler
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/binary/dhandler
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/binary/get_certificate.crt
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/binary/get_certificate.html
>@@ -94,6 +94,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/api/super_search.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/autohandler
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/close_form.mhtml
>+%%PORTDOCS%%%%DOCSDIR%%/htdocs/service/create_crr/cert_full_info.html
>+%%PORTDOCS%%%%DOCSDIR%%/htdocs/service/create_crr/cert_info.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/create_crr/error.mhtml
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/create_crr/form.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/create_crr/highlight_error.mhtml
>@@ -136,6 +138,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/loginagain.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/logout.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/open_form.mhtml
>+%%PORTDOCS%%%%DOCSDIR%%/htdocs/service/reset_token/unblock_pin.html
>+%%PORTDOCS%%%%DOCSDIR%%/htdocs/service/reset_token/unblock_reset.mhtml
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/send_form.mhtml
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/smartcard_personalization/failure.mhtml
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/smartcard_personalization/get_certificate_request.mhtml
>@@ -164,6 +168,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/continue.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/continue_issuance.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/dhandler
>+%%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/enroll_add_authentication.html
>+%%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/enroll_deny_authentication.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/fail_workflow.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/issue_certificate.html
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/service/workflow/activity/persist_csr.html
>@@ -187,40 +193,49 @@
> %%PORTDOCS%%%%DOCSDIR%%/htdocs/syshandler
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eg/openxpki-mason-cgi.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eg/openxpki-mason-mod_perl.conf
>-%%PORTDATA%%%%DATADIR%%/bin/openxpki.cgi
>-%%PORTDATA%%@dirrmtry %%DATADIR%%/bin
>-%%PORTDATA%%@dirrmtry %%DATADIR%%
>-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/eg
>-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/workflow/activity
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/workflow
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/smartcard_personalization
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/info
>+%%DATADIR%%/bin/openxpki.cgi
>+@dirrmtry %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason
>+@dirrmtry %%SITE_PERL%%/OpenXPKI/Client/HTML
>+@dirrmtry %%SITE_PERL%%/OpenXPKI/Client
>+@dirrmtry %%SITE_PERL%%/OpenXPKI
>+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML/Mason
>+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML
>+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Menu/Query
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Menu
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Renderer/Command
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Renderer/Service
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Renderer
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Request
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/authentication
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/binary
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/css
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/errors
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/images
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/lib/html
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/lib
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/api
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/create_crr
> %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/create_csr/bulk
> %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/create_csr
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/create_crr
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/api
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/info
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/reset_token
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/smartcard_personalization
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/workflow/activity
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service/workflow
> %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/service
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/lib/html
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/lib
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/images
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/errors
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/css
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/binary
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/authentication
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Request
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Renderer/Service
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Renderer/Command
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Renderer
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Menu/Query
>-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/Menu
> %%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs
> %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML/Mason
>-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/HTML
>-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/eg
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
>+@dirrmtry %%DATADIR%%/bin
>+@dirrmtry %%DATADIR%%
>+@dirrmtry %%PERL5_MAN3%%
>+@dirrmtry lib/perl5/%%PERL_VER%%/man
>+@dirrmtry lib/perl5/%%PERL_VER%%
> @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI
>-@dirrmtry %%SITE_PERL%%/OpenXPKI/Client/HTML/Mason
>-@dirrmtry %%SITE_PERL%%/OpenXPKI/Client/HTML
>-@dirrmtry %%SITE_PERL%%/OpenXPKI/Client
>-@dirrmtry %%SITE_PERL%%/OpenXPKI
>+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
>+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
>+@dirrmtry %%SITE_PERL%%
>+@dirrmtry lib/perl5/site_perl
>+@dirrmtry lib/perl5

Actions: View | Diff

Attachments on bug 191393: 144148