Attachment 143987 Details for Bug 191237 – ssl-admin add stage support

[patch] ssl-admin add stage support

ssl-admin-1.1.0_1.diff (text/plain), 4.54 KB, created by Olli Hauer on 2014-06-21 09:20:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2014-06-21 09:20:23 UTC

Size: 4.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 358671)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ssl-admin
> DISTVERSION=	1.1.0
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	ftp://ftp.secure-computing.net/pub/FreeBSD/ports/ssl-admin/ \
> 		ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/ssl-admin/
>@@ -10,21 +11,15 @@
> MAINTAINER=	ecrist@secure-computing.net
> COMMENT=	OpenSSL certificate manager with OpenVPN support
> 
>-LICENSE=	BSD
>+LICENSE=	BSD3CLAUSE
> 
> RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
> 
>-USES=		perl5
>+USES=		perl5 shebangfix
>+SHEBANG_FILES=	ssl-admin
> USE_PERL5=	run
>-MAN1=		ssl-admin.1
>-MAN5=		ssl-admin.conf.5
> SUB_FILES=	pkg-message
>-MANCOMPRESSED=	no
> MAKE_ENV=	ETCDIR=${PREFIX}/etc BINDIR=${PREFIX}/bin \
> 		MANDIR=${MANPREFIX}/man
> 
>-NO_STAGE=	yes
>-post-install:
>-	${CAT} ${PKGMESSAGE}
>-
> .include <bsd.port.mk>
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 0)
>+++ files/patch-Makefile	(working copy)
>@@ -0,0 +1,23 @@
>+--- ./Makefile.orig	2013-02-18 21:06:05.000000000 +0100
>++++ ./Makefile	2014-06-21 10:52:40.000000000 +0200
>+@@ -9,12 +9,12 @@
>+ 
>+ install:
>+ 
>+-	[ -e "${ETCDIR}/ssl-admin" ] || mkdir -p ${ETCDIR}/ssl-admin
>+-	sed s+~~~ETCDIR~~~+${ETCDIR}+g man1/ssl-admin.1 > ${MANDIR}/man1/ssl-admin.1
>+-	sed s+~~~ETCDIR~~~+${ETCDIR}+g man5/ssl-admin.conf.5 > ${MANDIR}/man5/ssl-admin.conf.5
>+-	install -c -g wheel -o root -m 0660 -S -v ssl-admin.conf ${ETCDIR}/ssl-admin/ssl-admin.conf.default
>+-	install -c -g wheel -o root -m 0660 -S -v openssl.conf ${ETCDIR}/ssl-admin/openssl.conf.default
>+-	[ -e "${ETCDIR}/ssl-admin/openssl.conf" ] || cp ${ETCDIR}/ssl-admin/openssl.conf.default ${ETCDIR}/ssl-admin/openssl.conf
>++	[ -e "${DESTDIR}${ETCDIR}/ssl-admin" ] || mkdir -p ${DESTDIR}${ETCDIR}/ssl-admin
>++	sed s+~~~ETCDIR~~~+${ETCDIR}+g man1/ssl-admin.1 > ${DESTDIR}${MANDIR}/man1/ssl-admin.1
>++	sed s+~~~ETCDIR~~~+${ETCDIR}+g man5/ssl-admin.conf.5 > ${DESTDIR}${MANDIR}/man5/ssl-admin.conf.5
>++	install -c -m 0640 -S -v ssl-admin.conf ${DESTDIR}${ETCDIR}/ssl-admin/ssl-admin.conf.sample
>++	install -c -m 0640 -S -v openssl.conf ${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf.sample
>++#	[ -e "${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf" ] || cp ${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf.default ${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf
>+ 	sed -i "" "s+~~~ETCDIR~~~+${ETCDIR}+g" ssl-admin
>+-	install -c -g wheel -o root -m 0755 -S -v ssl-admin ${BINDIR}/ssl-admin
>+-	chmod 0444 ${ETCDIR}/ssl-admin/*.conf.default
>++	install -c -m 0755 -S -v ssl-admin ${DESTDIR}${BINDIR}/ssl-admin
>++#	chmod 0444 ${ETCDIR}/ssl-admin/*.conf.sample
>
>Property changes on: files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-ssl-admin
>===================================================================
>--- files/patch-ssl-admin	(revision 0)
>+++ files/patch-ssl-admin	(working copy)
>@@ -0,0 +1,13 @@
>+--- ./ssl-admin.orig	2014-06-21 10:51:27.000000000 +0200
>++++ ./ssl-admin	2014-06-21 10:51:27.000000000 +0200
>+@@ -411,7 +411,9 @@
>+ 		my @files = ("ca.crt", "$cn.crt", "$cn.key");
>+ 		# read the template, get rid of the cert, key, and ca files
>+ 		while ($_ = <TEMPLATECONF>){
>+-			if (/^[\t\s]*(cert|ca|key)/){
>++			if (/key-direction/) {
>++				print NEWCONF $_;
>++			} elsif (/^[\t\s]*(cert|ca|key)/){
>+ 				# we don't want to write these to the new config
>+ 			} else {
>+ 				print NEWCONF $_;
>
>Property changes on: files/patch-ssl-admin
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 358671)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,6 @@
> bin/ssl-admin
>-etc/ssl-admin/ssl-admin.conf.default
>-@unexec if cmp -s %D/etc/ssl-admin/openssl.conf.default %D/etc/ssl-admin/openssl.conf; then rm -f %D/etc/ssl-admin/openssl.conf; fi
>-etc/ssl-admin/openssl.conf.default
>-@dirrmtry etc/ssl-admin
>+%%ETCDIR%%/openssl.conf.sample
>+%%ETCDIR%%/ssl-admin.conf.sample
>+man/man1/ssl-admin.1.gz
>+man/man5/ssl-admin.conf.5.gz
>+@dirrmtry %%ETCDIR%%

Actions: View | Diff

Attachments on bug 191237: 143987 | 144104 | 144105 | 144112