Attachment 143672 Details for Bug 190920 – patch to add staging

[patch] patch to add staging

patch.ox-dep (text/plain), 15.56 KB, created by Sergei Vyshenski on 2014-06-11 12:15:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Vyshenski

Created: 2014-06-11 12:15:30 UTC

Size: 15.56 KB

patch

obsolete

>diff -ruN security/p5-openxpki-deployment.orig/Makefile security/p5-openxpki-deployment/Makefile
>--- security/p5-openxpki-deployment.orig/Makefile	1970-01-01 03:00:00.000000000 +0300
>+++ security/p5-openxpki-deployment/Makefile	2014-06-11 13:19:05.000000000 +0400
>@@ -0,0 +1,46 @@
>+# Created by: Sergei Vyshenski <svysh.fbsd@gmail.com>
>+# $FreeBSD: head/security/p5-openxpki-deployment/Makefile 355321 2014-05-26 12:50:40Z miwi $
>+
>+PORTNAME=	openxpki-deployment
>+PORTVERSION=	0.9.1386
>+PORTREVISION=	2
>+CATEGORIES=	security perl5
>+MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
>+PKGNAMEPREFIX=	p5-
>+DIST_SUBDIR=	openxpki
>+
>+MAINTAINER=	svysh.fbsd@gmail.com
>+COMMENT=	Perl based enterprise class trustcenter software for PKI
>+
>+LICENSE=	ART20
>+
>+BUILD_DEPENDS=	\
>+	p5-openxpki-client>=0:${PORTSDIR}/security/p5-openxpki-client \
>+	p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
>+	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
>+	bash:${PORTSDIR}/shells/bash
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
>+
>+USES=		perl5 gmake
>+USE_RC_SUBR=	openxpki
>+HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--prefix ${PREFIX}
>+# Do not prepend PREFIX with STAGEDIR here, it is not a "destination".
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|>/dev/null 2>&1 | |' ${WRKSRC}/configure
>+
>+post-install:
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "================================ A piece of advice ==================================="
>+	@${ECHO_MSG} "===> Install your favorite database (enable utf-8 support if needed) and a web server."
>+	@${ECHO_MSG} "===> Perform deployment procedure for openxpki in a regular way."
>+	@${ECHO_MSG} "===> When asked for the name of the \"openxpki user\" answer \"openxpki\","
>+	@${ECHO_MSG} "===> and do not forget to add a line: \"User openxpki\" to the zone of your"
>+	@${ECHO_MSG} "===> OpenXPI-related (virtual) web server in your Apache configuration file."
>+	@${ECHO_MSG} ""
>+.if !defined(BATCH)
>+	@sleep 9
>+.endif
>+
>+.include <bsd.port.mk>
>diff -ruN security/p5-openxpki-deployment.orig/Makefile.orig security/p5-openxpki-deployment/Makefile.orig
>--- security/p5-openxpki-deployment.orig/Makefile.orig	2014-05-26 16:50:40.000000000 +0400
>+++ security/p5-openxpki-deployment/Makefile.orig	1970-01-01 03:00:00.000000000 +0300
>@@ -1,49 +0,0 @@
>-# Created by: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
>-# $FreeBSD: head/security/p5-openxpki-deployment/Makefile 355321 2014-05-26 12:50:40Z miwi $
>-
>-PORTNAME=	openxpki-deployment
>-PORTVERSION=	0.9.1386
>-PORTREVISION=	1
>-CATEGORIES=	security perl5
>-MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
>-PKGNAMEPREFIX=	p5-
>-DIST_SUBDIR=	openxpki
>-
>-MAINTAINER=	svysh.fbsd@gmail.com
>-COMMENT=	Perl based enterprise class trustcenter software for PKI
>-
>-BROKEN=		not staged
>-BUILD_DEPENDS=	\
>-	p5-openxpki-client>=0:${PORTSDIR}/security/p5-openxpki-client \
>-	p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
>-	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
>-	bash:${PORTSDIR}/shells/bash
>-RUN_DEPENDS:=	${BUILD_DEPENDS}
>-
>-MAN1=	openxpki-configure.1 \
>-	openxpki-metaconf.1 \
>-	openxpkiadm.1 \
>-	openxpkictl.1
>-USES=		perl5 gmake
>-USE_RC_SUBR=	openxpki
>-HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--prefix ${PREFIX}
>-
>-NO_STAGE=	yes
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|>/dev/null 2>&1 | |' ${WRKSRC}/configure
>-
>-post-install:
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "================================ A piece of advice ==================================="
>-	@${ECHO_MSG} "===> Install your favorite database (enable utf-8 support if needed) and a web server."
>-	@${ECHO_MSG} "===> Perform deployment procedure for openxpki in a regular way."
>-	@${ECHO_MSG} "===> When asked for the name of the \"openxpki user\" answer \"openxpki\","
>-	@${ECHO_MSG} "===> and do not forget to add a line: \"User openxpki\" to the zone of your"
>-	@${ECHO_MSG} "===> OpenXPI-related (virtual) web server in your Apache configuration file."
>-	@${ECHO_MSG} ""
>-.if !defined(BATCH)
>-	@sleep 9
>-.endif
>-
>-.include <bsd.port.mk>
>diff -ruN security/p5-openxpki-deployment.orig/files/openxpki.in security/p5-openxpki-deployment/files/openxpki.in
>--- security/p5-openxpki-deployment.orig/files/openxpki.in	1970-01-01 03:00:00.000000000 +0300
>+++ security/p5-openxpki-deployment/files/openxpki.in	2014-06-11 02:27:33.000000000 +0400
>@@ -0,0 +1,32 @@
>+#!/bin/sh
>+# $FreeBSD: head/security/p5-openxpki-deployment/files/openxpki.in 340872 2014-01-24 00:14:07Z mat $
>+
>+# PROVIDE: openxpki
>+# REQUIRE: LOGIN
>+# REQUIRE: postgresql
>+# REQUIRE: mysql
>+# KEYWORD: shutdown
>+
>+# Define this variable in the file /etc/rc.conf:
>+# openxpki_enable="YES"
>+# to ensure that openxpki starts at boot time.
>+#
>+# DO NOT CHANGE THESE DEFAULT VALUES HERE
>+# SET THEM IN THE /etc/rc.conf FILE
>+#
>+
>+. /etc/rc.subr
>+
>+name=openxpki
>+rcvar=openxpki_enable
>+load_rc_config $name
>+command="%%PREFIX%%/bin/openxpkictl"
>+
>+openxpki_enable="${openxpki_enable-NO}"
>+openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid"
>+
>+procname=openxpkid
>+
>+pidfile=${openxpki_pidfile}
>+
>+run_rc_command "$1"
>diff -ruN security/p5-openxpki-deployment.orig/files/openxpki.in.orig security/p5-openxpki-deployment/files/openxpki.in.orig
>--- security/p5-openxpki-deployment.orig/files/openxpki.in.orig	2014-01-24 04:14:07.000000000 +0400
>+++ security/p5-openxpki-deployment/files/openxpki.in.orig	1970-01-01 03:00:00.000000000 +0300
>@@ -1,36 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: head/security/p5-openxpki-deployment/files/openxpki.in 340872 2014-01-24 00:14:07Z mat $
>-
>-# PROVIDE: openxpki
>-# REQUIRE: LOGIN
>-# REQUIRE: postgresql
>-# REQUIRE: mysql
>-# KEYWORD: shutdown
>-
>-# Define this variable in the file /etc/rc.conf:
>-# openxpki_enable="YES"
>-# to ensure that openxpki starts at boot time.
>-#
>-# DO NOT CHANGE THESE DEFAULT VALUES HERE
>-#
>-# openxpki_flags	(Set as needed)
>-
>-openxpki_enable="${openxpki_enable-NO}"
>-openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid"
>-
>-case "$1" in 
>-    *start) command_args="start";;
>-esac
>-
>-. /etc/rc.subr
>-
>-name="openxpki"
>-rcvar=openxpki_enable
>-command="%%PREFIX%%/bin/openxpkictl"
>-procname="openxpkid"
>-
>-load_rc_config $name
>-
>-pidfile="${openxpki_pidfile}"
>-
>-run_rc_command "$1"
>diff -ruN security/p5-openxpki-deployment.orig/pkg-plist security/p5-openxpki-deployment/pkg-plist
>--- security/p5-openxpki-deployment.orig/pkg-plist	1970-01-01 03:00:00.000000000 +0300
>+++ security/p5-openxpki-deployment/pkg-plist	2014-06-11 01:06:00.000000000 +0400
>@@ -0,0 +1,78 @@
>+bin/openxpki-configure
>+bin/openxpki-metaconf
>+bin/openxpkiadm
>+bin/openxpkictl
>+man/man1/openxpki-configure.1.gz
>+man/man1/openxpki-metaconf.1.gz
>+man/man1/openxpkiadm.1.gz
>+man/man1/openxpkictl.1.gz
>+share/openxpki/templates/default/acl.xml
>+share/openxpki/templates/default/auth.xml
>+share/openxpki/templates/default/config.xml
>+share/openxpki/templates/default/database.xml
>+share/openxpki/templates/default/ldappublic.xml
>+share/openxpki/templates/default/log.conf
>+share/openxpki/templates/default/log_database.xml
>+share/openxpki/templates/default/notification.xml
>+share/openxpki/templates/default/notification/en/certificate_issued_correspond.txt
>+share/openxpki/templates/default/notification/en/csr_approvals_canceled_comment.txt
>+share/openxpki/templates/default/notification/en/csr_approved_comment.txt
>+share/openxpki/templates/default/notification/en/csr_created_comment.txt
>+share/openxpki/templates/default/notification/en/csr_created_correspond.txt
>+share/openxpki/templates/default/notification/en/csr_rejected_correspond.txt
>+share/openxpki/templates/default/openxpki.conf
>+share/openxpki/templates/default/profile.xml
>+share/openxpki/templates/default/token.xml
>+share/openxpki/templates/default/workflow.xml
>+share/openxpki/templates/default/workflow_activity_certificate_issuance.xml
>+share/openxpki/templates/default/workflow_activity_certificate_ldap_publishing.xml
>+share/openxpki/templates/default/workflow_activity_certificate_revocation_request.xml
>+share/openxpki/templates/default/workflow_activity_certificate_signing_request.xml
>+share/openxpki/templates/default/workflow_activity_crl_issuance.xml
>+share/openxpki/templates/default/workflow_activity_dataexchange.xml
>+share/openxpki/templates/default/workflow_activity_null.xml
>+share/openxpki/templates/default/workflow_activity_password_safe.xml
>+share/openxpki/templates/default/workflow_activity_scep_request.xml
>+share/openxpki/templates/default/workflow_activity_smartcard_personalization.xml
>+share/openxpki/templates/default/workflow_condition.xml
>+share/openxpki/templates/default/workflow_def_certificate_issuance.xml
>+share/openxpki/templates/default/workflow_def_certificate_ldap_publishing.xml
>+share/openxpki/templates/default/workflow_def_certificate_revocation_request.xml
>+share/openxpki/templates/default/workflow_def_certificate_signing_request.xml
>+share/openxpki/templates/default/workflow_def_crl_issuance.xml
>+share/openxpki/templates/default/workflow_def_password_safe.xml
>+share/openxpki/templates/default/workflow_def_scep_request.xml
>+share/openxpki/templates/default/workflow_def_smartcard_personalization.xml
>+share/openxpki/templates/default/workflow_validator_certificate_revocation_request.xml
>+share/openxpki/templates/default/workflow_validator_certificate_signing_request.xml
>+share/openxpki/templates/default/workflow_validator_password_safe.xml
>+share/openxpki/templates/quickstart/acl.xml
>+share/openxpki/templates/quickstart/auth.xml
>+share/openxpki/templates/quickstart/config.xml
>+share/openxpki/templates/quickstart/database.xml
>+share/openxpki/templates/quickstart/log.conf
>+share/openxpki/templates/quickstart/log_database.xml
>+share/openxpki/templates/quickstart/notification.xml
>+share/openxpki/templates/quickstart/openxpki.conf
>+share/openxpki/templates/quickstart/profile.xml
>+share/openxpki/templates/quickstart/token.xml
>+share/openxpki/templates/quickstart/workflow.xml
>+share/openxpki/templates/quickstart/workflow_activity_certificate_issuance.xml
>+share/openxpki/templates/quickstart/workflow_activity_certificate_revocation_request.xml
>+share/openxpki/templates/quickstart/workflow_activity_certificate_signing_request.xml
>+share/openxpki/templates/quickstart/workflow_activity_crl_issuance.xml
>+share/openxpki/templates/quickstart/workflow_activity_null.xml
>+share/openxpki/templates/quickstart/workflow_condition.xml
>+share/openxpki/templates/quickstart/workflow_def_certificate_issuance.xml
>+share/openxpki/templates/quickstart/workflow_def_certificate_revocation_request.xml
>+share/openxpki/templates/quickstart/workflow_def_certificate_signing_request.xml
>+share/openxpki/templates/quickstart/workflow_def_crl_issuance.xml
>+share/openxpki/templates/quickstart/workflow_validator_certificate_revocation_request.xml
>+share/openxpki/templates/quickstart/workflow_validator_certificate_signing_request.xml
>+@dirrmtry share/openxpki/templates/default/notification/en
>+@dirrmtry share/openxpki/templates/default/notification
>+@dirrmtry share/openxpki/templates/default
>+@dirrmtry share/openxpki/templates/quickstart/notification
>+@dirrmtry share/openxpki/templates/quickstart
>+@dirrmtry share/openxpki/templates
>+@dirrmtry share/openxpki
>diff -ruN security/p5-openxpki-deployment.orig/pkg-plist.orig security/p5-openxpki-deployment/pkg-plist.orig
>--- security/p5-openxpki-deployment.orig/pkg-plist.orig	2014-01-22 19:16:56.000000000 +0400
>+++ security/p5-openxpki-deployment/pkg-plist.orig	1970-01-01 03:00:00.000000000 +0300
>@@ -1,74 +0,0 @@
>-bin/openxpki-configure
>-bin/openxpki-metaconf
>-bin/openxpkiadm
>-bin/openxpkictl
>-share/openxpki/templates/default/acl.xml
>-share/openxpki/templates/default/auth.xml
>-share/openxpki/templates/default/config.xml
>-share/openxpki/templates/default/database.xml
>-share/openxpki/templates/default/ldappublic.xml
>-share/openxpki/templates/default/log.conf
>-share/openxpki/templates/default/log_database.xml
>-share/openxpki/templates/default/notification.xml
>-share/openxpki/templates/default/notification/en/certificate_issued_correspond.txt
>-share/openxpki/templates/default/notification/en/csr_approvals_canceled_comment.txt
>-share/openxpki/templates/default/notification/en/csr_approved_comment.txt
>-share/openxpki/templates/default/notification/en/csr_created_comment.txt
>-share/openxpki/templates/default/notification/en/csr_created_correspond.txt
>-share/openxpki/templates/default/notification/en/csr_rejected_correspond.txt
>-share/openxpki/templates/default/openxpki.conf
>-share/openxpki/templates/default/profile.xml
>-share/openxpki/templates/default/token.xml
>-share/openxpki/templates/default/workflow.xml
>-share/openxpki/templates/default/workflow_activity_certificate_issuance.xml
>-share/openxpki/templates/default/workflow_activity_certificate_ldap_publishing.xml
>-share/openxpki/templates/default/workflow_activity_certificate_revocation_request.xml
>-share/openxpki/templates/default/workflow_activity_certificate_signing_request.xml
>-share/openxpki/templates/default/workflow_activity_crl_issuance.xml
>-share/openxpki/templates/default/workflow_activity_dataexchange.xml
>-share/openxpki/templates/default/workflow_activity_null.xml
>-share/openxpki/templates/default/workflow_activity_password_safe.xml
>-share/openxpki/templates/default/workflow_activity_scep_request.xml
>-share/openxpki/templates/default/workflow_activity_smartcard_personalization.xml
>-share/openxpki/templates/default/workflow_condition.xml
>-share/openxpki/templates/default/workflow_def_certificate_issuance.xml
>-share/openxpki/templates/default/workflow_def_certificate_ldap_publishing.xml
>-share/openxpki/templates/default/workflow_def_certificate_revocation_request.xml
>-share/openxpki/templates/default/workflow_def_certificate_signing_request.xml
>-share/openxpki/templates/default/workflow_def_crl_issuance.xml
>-share/openxpki/templates/default/workflow_def_password_safe.xml
>-share/openxpki/templates/default/workflow_def_scep_request.xml
>-share/openxpki/templates/default/workflow_def_smartcard_personalization.xml
>-share/openxpki/templates/default/workflow_validator_certificate_revocation_request.xml
>-share/openxpki/templates/default/workflow_validator_certificate_signing_request.xml
>-share/openxpki/templates/default/workflow_validator_password_safe.xml
>-share/openxpki/templates/quickstart/acl.xml
>-share/openxpki/templates/quickstart/auth.xml
>-share/openxpki/templates/quickstart/config.xml
>-share/openxpki/templates/quickstart/database.xml
>-share/openxpki/templates/quickstart/log.conf
>-share/openxpki/templates/quickstart/log_database.xml
>-share/openxpki/templates/quickstart/notification.xml
>-share/openxpki/templates/quickstart/openxpki.conf
>-share/openxpki/templates/quickstart/profile.xml
>-share/openxpki/templates/quickstart/token.xml
>-share/openxpki/templates/quickstart/workflow.xml
>-share/openxpki/templates/quickstart/workflow_activity_certificate_issuance.xml
>-share/openxpki/templates/quickstart/workflow_activity_certificate_revocation_request.xml
>-share/openxpki/templates/quickstart/workflow_activity_certificate_signing_request.xml
>-share/openxpki/templates/quickstart/workflow_activity_crl_issuance.xml
>-share/openxpki/templates/quickstart/workflow_activity_null.xml
>-share/openxpki/templates/quickstart/workflow_condition.xml
>-share/openxpki/templates/quickstart/workflow_def_certificate_issuance.xml
>-share/openxpki/templates/quickstart/workflow_def_certificate_revocation_request.xml
>-share/openxpki/templates/quickstart/workflow_def_certificate_signing_request.xml
>-share/openxpki/templates/quickstart/workflow_def_crl_issuance.xml
>-share/openxpki/templates/quickstart/workflow_validator_certificate_revocation_request.xml
>-share/openxpki/templates/quickstart/workflow_validator_certificate_signing_request.xml
>-@dirrmtry share/openxpki/templates/quickstart/notification
>-@dirrmtry share/openxpki/templates/quickstart
>-@dirrmtry share/openxpki/templates/default/notification/en
>-@dirrmtry share/openxpki/templates/default/notification
>-@dirrmtry share/openxpki/templates/default
>-@dirrmtry share/openxpki/templates
>-@dirrmtry share/openxpki

Actions: View | Diff

Attachments on bug 190920: 143672 | 143702