Attachment #143987 for bug #191237





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/

MAINTAINER=	ecrist@secure-computing.net
COMMENT=	OpenSSL certificate manager with OpenVPN support

LICENSE=	BSD3CLAUSE

RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip

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>




--- ./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

Line 0 Link Here

(-)files/patch-ssl-admin (+13 lines)
	1	--- ./ssl-admin.orig 2014-06-21 10:51:27.000000000 +0200
	2	+++ ./ssl-admin 2014-06-21 10:51:27.000000000 +0200
	3	@@ -411,7 +411,9 @@
	4	my @files = ("ca.crt", "$cn.crt", "$cn.key");
	5	# read the template, get rid of the cert, key, and ca files
	6	while ($_ = <TEMPLATECONF>){
	7	- if (/^[\t\s]*(cert\|ca\|key)/){
	8	+ if (/key-direction/) {
	9	+ print NEWCONF $_;
	10	+ } elsif (/^[\t\s]*(cert\|ca\|key)/){
	11	# we don't want to write these to the new config
	12	} else {
	13	print NEWCONF $_;

Lines 1-5 Link Here

(-)pkg-plist (-4 / +5 lines)
1	bin/ssl-admin	1	bin/ssl-admin
2	etc/ssl-admin/ssl-admin.conf.default	2	%%ETCDIR%%/openssl.conf.sample
3	@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	3	%%ETCDIR%%/ssl-admin.conf.sample
4	etc/ssl-admin/openssl.conf.default	4	man/man1/ssl-admin.1.gz
5	@dirrmtry etc/ssl-admin	5	man/man5/ssl-admin.conf.5.gz
		6	@dirrmtry %%ETCDIR%%

Return to bug 191237

Lines 3-8 Link Here

(-)Makefile (-9 / +4 lines)
3		3
4	PORTNAME= ssl-admin	4	PORTNAME= ssl-admin
5	DISTVERSION= 1.1.0	5	DISTVERSION= 1.1.0
		6	PORTREVISION= 1
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES= ftp://ftp.secure-computing.net/pub/FreeBSD/ports/ssl-admin/ \	8	MASTER_SITES= ftp://ftp.secure-computing.net/pub/FreeBSD/ports/ssl-admin/ \
8	ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/ssl-admin/	9	ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/ssl-admin/
Lines 10-30 Link Here
10	MAINTAINER= ecrist@secure-computing.net	11	MAINTAINER= ecrist@secure-computing.net
11	COMMENT= OpenSSL certificate manager with OpenVPN support	12	COMMENT= OpenSSL certificate manager with OpenVPN support
12		13
13	LICENSE= BSD	14	LICENSE= BSD3CLAUSE
14		15
15	RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip	16	RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
16		17
17	USES= perl5	18	USES= perl5 shebangfix
		19	SHEBANG_FILES= ssl-admin
18	USE_PERL5= run	20	USE_PERL5= run
19	MAN1= ssl-admin.1
20	MAN5= ssl-admin.conf.5
21	SUB_FILES= pkg-message	21	SUB_FILES= pkg-message
22	MANCOMPRESSED= no
23	MAKE_ENV= ETCDIR=${PREFIX}/etc BINDIR=${PREFIX}/bin \	22	MAKE_ENV= ETCDIR=${PREFIX}/etc BINDIR=${PREFIX}/bin \
24	MANDIR=${MANPREFIX}/man	23	MANDIR=${MANPREFIX}/man
25		24
26	NO_STAGE= yes
27	post-install:
28	${CAT} ${PKGMESSAGE}
29
30	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-Makefile (+23 lines)
	1	--- ./Makefile.orig 2013-02-18 21:06:05.000000000 +0100
	2	+++ ./Makefile 2014-06-21 10:52:40.000000000 +0200
	3	@@ -9,12 +9,12 @@
	4
	5	install:
	6
	7	- [ -e "${ETCDIR}/ssl-admin" ] \|\| mkdir -p ${ETCDIR}/ssl-admin
	8	- sed s+~~~ETCDIR~~~+${ETCDIR}+g man1/ssl-admin.1 > ${MANDIR}/man1/ssl-admin.1
	9	- sed s+~~~ETCDIR~~~+${ETCDIR}+g man5/ssl-admin.conf.5 > ${MANDIR}/man5/ssl-admin.conf.5
	10	- install -c -g wheel -o root -m 0660 -S -v ssl-admin.conf ${ETCDIR}/ssl-admin/ssl-admin.conf.default
	11	- install -c -g wheel -o root -m 0660 -S -v openssl.conf ${ETCDIR}/ssl-admin/openssl.conf.default
	12	- [ -e "${ETCDIR}/ssl-admin/openssl.conf" ] \|\| cp ${ETCDIR}/ssl-admin/openssl.conf.default ${ETCDIR}/ssl-admin/openssl.conf
	13	+ [ -e "${DESTDIR}${ETCDIR}/ssl-admin" ] \|\| mkdir -p ${DESTDIR}${ETCDIR}/ssl-admin
	14	+ sed s+~~~ETCDIR~~~+${ETCDIR}+g man1/ssl-admin.1 > ${DESTDIR}${MANDIR}/man1/ssl-admin.1
	15	+ sed s+~~~ETCDIR~~~+${ETCDIR}+g man5/ssl-admin.conf.5 > ${DESTDIR}${MANDIR}/man5/ssl-admin.conf.5
	16	+ install -c -m 0640 -S -v ssl-admin.conf ${DESTDIR}${ETCDIR}/ssl-admin/ssl-admin.conf.sample
	17	+ install -c -m 0640 -S -v openssl.conf ${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf.sample
	18	+# [ -e "${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf" ] \|\| cp ${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf.default ${DESTDIR}${ETCDIR}/ssl-admin/openssl.conf
	19	sed -i "" "s+~~~ETCDIR~~~+${ETCDIR}+g" ssl-admin
	20	- install -c -g wheel -o root -m 0755 -S -v ssl-admin ${BINDIR}/ssl-admin
	21	- chmod 0444 ${ETCDIR}/ssl-admin/*.conf.default
	22	+ install -c -m 0755 -S -v ssl-admin ${DESTDIR}${BINDIR}/ssl-admin
	23	+# chmod 0444 ${ETCDIR}/ssl-admin/*.conf.sample