Attachment 143702 Details for Bug 190920 – new (corrected) patch

[patch] new (corrected) patch

patch2.ox-dep (text/plain), 3.65 KB, created by Sergei Vyshenski on 2014-06-12 09:35:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergei Vyshenski

Created: 2014-06-12 09:35:46 UTC

Size: 3.65 KB

patch

obsolete

>diff -ru security/p5-openxpki-deployment.orig/Makefile security/p5-openxpki-deployment/Makefile
>--- security/p5-openxpki-deployment.orig/Makefile	2014-05-26 16:50:40.000000000 +0400
>+++ security/p5-openxpki-deployment/Makefile	2014-06-11 13:19:05.000000000 +0400
>@@ -1,9 +1,9 @@
>-# Created by: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
>+# 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=	1
>+PORTREVISION=	2
> CATEGORIES=	security perl5
> MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
> PKGNAMEPREFIX=	p5-
>@@ -12,7 +12,8 @@
> MAINTAINER=	svysh.fbsd@gmail.com
> COMMENT=	Perl based enterprise class trustcenter software for PKI
> 
>-BROKEN=		not staged
>+LICENSE=	ART20
>+
> BUILD_DEPENDS=	\
> 	p5-openxpki-client>=0:${PORTSDIR}/security/p5-openxpki-client \
> 	p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
>@@ -20,16 +21,12 @@
> 	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}
>+# Do not prepend PREFIX with STAGEDIR here, it is not a "destination".
> 
>-NO_STAGE=	yes
> post-patch:
> 	@${REINPLACE_CMD} -e 's|>/dev/null 2>&1 | |' ${WRKSRC}/configure
> 
>diff -ru security/p5-openxpki-deployment.orig/files/openxpki.in security/p5-openxpki-deployment/files/openxpki.in
>--- security/p5-openxpki-deployment.orig/files/openxpki.in	2014-01-24 04:14:07.000000000 +0400
>+++ security/p5-openxpki-deployment/files/openxpki.in	2014-06-11 02:27:33.000000000 +0400
>@@ -12,25 +12,21 @@
> # to ensure that openxpki starts at boot time.
> #
> # DO NOT CHANGE THESE DEFAULT VALUES HERE
>+# SET THEM IN THE /etc/rc.conf FILE
> #
>-# 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"
>+name=openxpki
> rcvar=openxpki_enable
>+load_rc_config $name
> command="%%PREFIX%%/bin/openxpkictl"
>-procname="openxpkid"
> 
>-load_rc_config $name
>+openxpki_enable="${openxpki_enable-NO}"
>+openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid"
>+
>+procname=openxpkid
> 
>-pidfile="${openxpki_pidfile}"
>+pidfile=${openxpki_pidfile}
> 
> run_rc_command "$1"
>diff -ru security/p5-openxpki-deployment.orig/pkg-plist security/p5-openxpki-deployment/pkg-plist
>--- security/p5-openxpki-deployment.orig/pkg-plist	2014-01-22 19:16:56.000000000 +0400
>+++ security/p5-openxpki-deployment/pkg-plist	2014-06-11 01:06:00.000000000 +0400
>@@ -2,6 +2,10 @@
> 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
>@@ -65,10 +69,10 @@
> 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/quickstart/notification
>+@dirrmtry share/openxpki/templates/quickstart
> @dirrmtry share/openxpki/templates
> @dirrmtry share/openxpki

Actions: View | Diff

Attachments on bug 190920: 143672 | 143702