Attachment #162094 for bug #203804

View | Details | Raw Unified | Return to bug 203804
Collapse All | Expand All




# $FreeBSD: head/security/xca/Makefile 399318 2015-10-14 23:51:30Z amdmi3 $

PORTNAME=	xca
PORTVERSION=	1.3.2
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	SF



LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl

USES=		desktop-file-utils gmake pkgconfig shared-mime-info
USE_OPENSSL=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-openssl=${OPENSSLDIR} \
		--with-qt=${QT_PREFIX}
MAKE_ARGS=	DOCTOOL="${TRUE}"
DESTDIRNAME=	destdir

CFLAGS+=	-I${LOCALBASE}/include
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE=		DOCS
OPTIONS_SINGLE=		TOOLKIT
OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
OPTIONS_DEFAULT=	QT4

QT4_USE=		qt4=gui,linguist_build,moc_build,qmake_build \
			qt4=rcc_build,uic_build
QT5_USE=		qt5=widgets,buildtools_build,linguist_build
TOOLKIT_DESC=		Qt toolkit

post-patch:
	@${REINPLACE_CMD} -e \
		'/^CFLAGS/s|-O2||' ${WRKSRC}/Local.mak.in
	@${REINPLACE_CMD} -e \
		'/install/s|-D|-c|' ${WRKSRC}/img/Makefile

post-patch-QT5-off:
	@${REINPLACE_CMD} -e \
		's|Qt5|Qt0|g' ${WRKSRC}/configure

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xca*
	@echo "prefix=${PREFIX}" >> ${WRKSRC}/Local.mak
	@echo "etc=${PREFIX}/etc/xca" >> ${WRKSRC}/Local.mak
	@echo "basedir=" >> ${WRKSRC}/Local.mak
	@echo "docdir=${DOCSDIR}" >> ${WRKSRC}/Local.mak
	@echo "#define PREFIX \"${PREFIX}\"" > ${WRKSRC}/local.h
	@echo "#define ETC \"${PREFIX}/etc/xca\"" >> ${WRKSRC}/local.h
	@echo "#define VER \"${PORTVERSION}\"" >> ${WRKSRC}/local.h
	@echo "#define DOCDIR \"${DOCSDIR}\"" >> ${WRKSRC}/local.h
	@${REINPLACE_CMD} -e "/rR/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e "/VPATH/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/misc/Makefile
	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)security/xca/distinfo (-2 / +2 lines)
1	SHA256 (xca-0.9.3.tar.gz) = 6842b50c8b4478070d8af743cb72aee1f53a2c4ff2b8285fcec5f856119cc6ba	1	SHA256 (xca-1.3.2.tar.gz) = 04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4
2	SIZE (xca-0.9.3.tar.gz) = 755165	2	SIZE (xca-1.3.2.tar.gz) = 897947




--- doc/Makefile.orig	2012-05-12 09:37:14 UTC
+++ doc/Makefile
@@ -5,7 +5,7 @@ endif
 
 DELFILES=xca*.html xca.1.gz
 
-doc: xca.1.gz xca.html
+doc: xca.1.gz
 include $(TOPDIR)/Rules.mak
 
 mandir=man
@@ -15,10 +15,7 @@ xca.1.gz: xca.1
 
 xca.html: xca.sgml
 	rm -f xca*.html
-	echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
-	test ! -f xca-doc.tgz || tar zxf xca-doc.tgz
-	@$(PRINT) "  DOC    [$(BASENAME)] $@"
-	$(LINUXDOC) -B html $< >/dev/null
+	echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' >> $@
 
 install: xca.1.gz xca.html
 	install -m 755 -d $(destdir)$(docdir) \
@@ -26,8 +23,4 @@ install: xca.1.gz xca.html
 	install -m 644 xca*.html $(destdir)$(docdir)
 	install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
 
-app: xca.html
-	mkdir -p $(APPDIR)/Resources
-	install -m 644 xca*.html $(APPDIR)/Resources
-
 

Lines 1-11 Link Here

(-)security/xca/files/patch-img__Makefile (-11 lines)
1	--- img/Makefile.orig 2012-05-12 09:37:14 UTC
2	+++ img/Makefile
3	@@ -13,7 +13,7 @@ include $(TOPDIR)/Rules.mak
4	sinclude .depend
5
6	install: xca-32x32.xpm
7	- install -D -m 644 $^ $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
8	+ install -d -m 755 $(destdir)$(prefix)/share/pixmaps && install -m 644 $^ $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
9
10	imgres.cpp: imgres.rcc
11	@$(PRINT) " RCC [$(BASENAME)] $@"




--- lib/x509v3ext.cpp.orig	2012-05-12 09:37:14 UTC
+++ lib/x509v3ext.cpp
@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSIO
 x509v3ext::x509v3ext(const x509v3ext &n)
 {
 	ext = NULL;
+	if (!n.isValid())
+		return;
 	set(n.ext);
 }
 
@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
 
 bool x509v3ext::isValid() const
 {
-	return ext->value->length > 0 &&
+	return ext && ext->value && ext->value->length > 0 &&
 		OBJ_obj2nid(ext->object) != NID_undef;
 }
 

Lines 1-8 Link Here

(-)security/xca/pkg-descr (-7 / +7 lines)
1	Graphical certification authority is an interface for managing	1	Graphical certification authority is an interface for managing RSA keys
2	RSA keys and certificates, and the creation and signing of PKCS#10 requests.	2	and certificates, and the creation and signing of PKCS#10 requests. It
3	It uses the OpenSSL library and a Berkeley DB for key and certificate storage.	3	uses the OpenSSL library and a Berkeley DB for key and certificate
4	It supports importing and exporting keys and PEM DER PKCS8 certificates,	4	storage. It supports importing and exporting keys and PEM DER PKCS8
5	signing and revoking of PEM DER PKCS12, and selection of x509v3 extensions.	5	certificates, signing and revoking of PEM DER PKCS12, and selection of
6	A tree view of certificates is presented.	6	x509v3 extensions. A tree view of certificates is presented.
7		7
8	WWW: http://www.hohnstaedt.de/xca.html	8	WWW: http://xca.hohnstaedt.de/




bin/xca
bin/xca_db_stat
man/man1/xca.1.gz
man/man1/xca_db_stat.1.gz
share/applications/xca.desktop
%%PORTDOCS%%%%DOCSDIR%%/xca-1.html
%%PORTDOCS%%%%DOCSDIR%%/xca-10.html
%%PORTDOCS%%%%DOCSDIR%%/xca-11.html
%%PORTDOCS%%%%DOCSDIR%%/xca-12.html
%%PORTDOCS%%%%DOCSDIR%%/xca-13.html
%%PORTDOCS%%%%DOCSDIR%%/xca-14.html
%%PORTDOCS%%%%DOCSDIR%%/xca-15.html
%%PORTDOCS%%%%DOCSDIR%%/xca-2.html
%%PORTDOCS%%%%DOCSDIR%%/xca-3.html
%%PORTDOCS%%%%DOCSDIR%%/xca-4.html
%%PORTDOCS%%%%DOCSDIR%%/xca-5.html
%%PORTDOCS%%%%DOCSDIR%%/xca-6.html
%%PORTDOCS%%%%DOCSDIR%%/xca-7.html
%%PORTDOCS%%%%DOCSDIR%%/xca-8.html
%%PORTDOCS%%%%DOCSDIR%%/xca-9.html
%%PORTDOCS%%%%DOCSDIR%%/xca.html
share/mime/packages/xca.xml
share/pixmaps/xca-32x32.xpm
%%DATADIR%%/CA.xca
%%DATADIR%%/HTTPS_client.xca
%%DATADIR%%/HTTPS_server.xca

%%DATADIR%%/xca_de.qm
%%DATADIR%%/xca_es.qm
%%DATADIR%%/xca_fr.qm
%%DATADIR%%/xca_hr.qm
%%DATADIR%%/xca_ru.qm
%%DATADIR%%/xca_tr.qm
%%DOCSDIR%%/xca.html
man/man1/xca.1.gz
share/applications/xca.desktop
share/mime/packages/xca.xml
share/pixmaps/xca-32x32.xpm

Return to bug 203804

Lines 2-9 Link Here

(-)security/xca/Makefile (-34 / +32 lines)
2	# $FreeBSD: head/security/xca/Makefile 399318 2015-10-14 23:51:30Z amdmi3 $	2	# $FreeBSD: head/security/xca/Makefile 399318 2015-10-14 23:51:30Z amdmi3 $
3		3
4	PORTNAME= xca	4	PORTNAME= xca
5	PORTVERSION= 0.9.3	5	PORTVERSION= 1.3.2
6	PORTREVISION= 3	6	PORTREVISION= 1
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
Lines 15-55 Link Here
15		15
16	LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl	16	LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl
17		17
		18	USES= desktop-file-utils gmake pkgconfig shared-mime-info
18	USE_OPENSSL= yes	19	USE_OPENSSL= yes
19	USE_QT4= gui moc_build uic_build qmake_build rcc_build linguist_build	20	GNU_CONFIGURE= yes
20	USES= desktop-file-utils gmake shared-mime-info	21	CONFIGURE_ARGS= --with-openssl=${OPENSSLDIR} \
		22	--with-qt=${QT_PREFIX}
		23	MAKE_ARGS= DOCTOOL="${TRUE}"
21	DESTDIRNAME= destdir	24	DESTDIRNAME= destdir
22		25
23	.include <bsd.port.pre.mk>	26	CFLAGS+= -I${LOCALBASE}/include
24		27	CPPFLAGS+= -I${LOCALBASE}/include
25	BROKEN_sparc64= fails to link	28	LDFLAGS+= -L${LOCALBASE}/lib
26		29
27	.if ${OSVERSION} >= 1000054	30	OPTIONS_DEFINE= DOCS
28	LD_CXX_LIB= -lc++	31	OPTIONS_SINGLE= TOOLKIT
29	.endif	32	OPTIONS_SINGLE_TOOLKIT= QT4 QT5
		33	OPTIONS_DEFAULT= QT4
		34
		35	QT4_USE= qt4=gui,linguist_build,moc_build,qmake_build \
		36	qt4=rcc_build,uic_build
		37	QT5_USE= qt5=widgets,buildtools_build,linguist_build
		38	TOOLKIT_DESC= Qt toolkit
30		39
31	post-patch:	40	post-patch:
32	@echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak	41	@${REINPLACE_CMD} -e \
33	@echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak	42	'/^CFLAGS/s\|-O2\|\|' ${WRKSRC}/Local.mak.in
34	@echo "LDFLAGS= ${LDFLAGS}" >> ${WRKSRC}/Local.mak	43	@${REINPLACE_CMD} -e \
35	@echo "LIBS= ${LIBS} -L${QT_LIBDIR} -L${LOCALBASE}/lib -lQtCore -lQtGui -lpthread -lcrypto -lltdl ${LD_CXX_LIB}" >> ${WRKSRC}/Local.mak	44	'/install/s\|-D\|-c\|' ${WRKSRC}/img/Makefile
36	@echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak	45
37	@echo "UIC=${QT_PREFIX}/bin/uic-qt4" >> ${WRKSRC}/Local.mak	46	post-patch-QT5-off:
38	@echo "RCC=${LOCALBASE}/bin/rcc" >> ${WRKSRC}/Local.mak	47	@${REINPLACE_CMD} -e \
39	@echo "LRELEASE=${LOCALBASE}/bin/lrelease-qt4" >> ${WRKSRC}/Local.mak	48	's\|Qt5\|Qt0\|g' ${WRKSRC}/configure
40	@echo "CC=${CC}" >> ${WRKSRC}/Local.mak	49
41	@echo "LD=${LD}" >> ${WRKSRC}/Local.mak	50	post-install:
42	@echo "STRIP=${STRIP_CMD}" >> ${WRKSRC}/Local.mak	51	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xca*
43	@echo "prefix=${PREFIX}" >> ${WRKSRC}/Local.mak
44	@echo "etc=${PREFIX}/etc/xca" >> ${WRKSRC}/Local.mak
45	@echo "basedir=" >> ${WRKSRC}/Local.mak
46	@echo "docdir=${DOCSDIR}" >> ${WRKSRC}/Local.mak
47	@echo "#define PREFIX \"${PREFIX}\"" > ${WRKSRC}/local.h
48	@echo "#define ETC \"${PREFIX}/etc/xca\"" >> ${WRKSRC}/local.h
49	@echo "#define VER \"${PORTVERSION}\"" >> ${WRKSRC}/local.h
50	@echo "#define DOCDIR \"${DOCSDIR}\"" >> ${WRKSRC}/local.h
51	@${REINPLACE_CMD} -e "/rR/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/Makefile
52	@${REINPLACE_CMD} -e "/VPATH/{G;s/$$/TOPDIR_/;}" -e "s:\(TOPDIR\)_:\1=${WRKSRC}:" ${WRKSRC}/misc/Makefile
53	@${REINPLACE_CMD} -e 's\|malloc.h\|stdlib.h\|' ${WRKSRC}/lib/import.cpp
54		52
55	.include <bsd.port.post.mk>	53	.include <bsd.port.mk>

Lines 1-32 Link Here

(-)security/xca/files/patch-doc__Makefile (-32 lines)
1	--- doc/Makefile.orig 2012-05-12 09:37:14 UTC
2	+++ doc/Makefile
3	@@ -5,7 +5,7 @@ endif
4
5	DELFILES=xca*.html xca.1.gz
6
7	-doc: xca.1.gz xca.html
8	+doc: xca.1.gz
9	include $(TOPDIR)/Rules.mak
10
11	mandir=man
12	@@ -15,10 +15,7 @@ xca.1.gz: xca.1
13
14	xca.html: xca.sgml
15	rm -f xca*.html
16	- echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' > $@
17	- test ! -f xca-doc.tgz \|\| tar zxf xca-doc.tgz
18	- @$(PRINT) " DOC [$(BASENAME)] $@"
19	- $(LINUXDOC) -B html $< >/dev/null
20	+ echo 'The documentation for XCA can be viewed online at: <a href="http://xca.sourceforge.net/">http://xca.sourceforge.net/</a>.' >> $@
21
22	install: xca.1.gz xca.html
23	install -m 755 -d $(destdir)$(docdir) \
24	@@ -26,8 +23,4 @@ install: xca.1.gz xca.html
25	install -m 644 xca*.html $(destdir)$(docdir)
26	install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
27
28	-app: xca.html
29	- mkdir -p $(APPDIR)/Resources
30	- install -m 644 xca*.html $(APPDIR)/Resources
31	-
32

Lines 1-20 Link Here

(-)security/xca/files/patch-lib__x509v3ext.cpp (-20 lines)
1	--- lib/x509v3ext.cpp.orig 2012-05-12 09:37:14 UTC
2	+++ lib/x509v3ext.cpp
3	@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSIO
4	x509v3ext::x509v3ext(const x509v3ext &n)
5	{
6	ext = NULL;
7	+ if (!n.isValid())
8	+ return;
9	set(n.ext);
10	}
11
12	@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
13
14	bool x509v3ext::isValid() const
15	{
16	- return ext->value->length > 0 &&
17	+ return ext && ext->value && ext->value->length > 0 &&
18	OBJ_obj2nid(ext->object) != NID_undef;
19	}
20

Lines 1-4 Link Here

(-)security/xca/pkg-plist (-5 / +23 lines)
1	bin/xca	1	bin/xca
		2	bin/xca_db_stat
		3	man/man1/xca.1.gz
		4	man/man1/xca_db_stat.1.gz
		5	share/applications/xca.desktop
		6	%%PORTDOCS%%%%DOCSDIR%%/xca-1.html
		7	%%PORTDOCS%%%%DOCSDIR%%/xca-10.html
		8	%%PORTDOCS%%%%DOCSDIR%%/xca-11.html
		9	%%PORTDOCS%%%%DOCSDIR%%/xca-12.html
		10	%%PORTDOCS%%%%DOCSDIR%%/xca-13.html
		11	%%PORTDOCS%%%%DOCSDIR%%/xca-14.html
		12	%%PORTDOCS%%%%DOCSDIR%%/xca-15.html
		13	%%PORTDOCS%%%%DOCSDIR%%/xca-2.html
		14	%%PORTDOCS%%%%DOCSDIR%%/xca-3.html
		15	%%PORTDOCS%%%%DOCSDIR%%/xca-4.html
		16	%%PORTDOCS%%%%DOCSDIR%%/xca-5.html
		17	%%PORTDOCS%%%%DOCSDIR%%/xca-6.html
		18	%%PORTDOCS%%%%DOCSDIR%%/xca-7.html
		19	%%PORTDOCS%%%%DOCSDIR%%/xca-8.html
		20	%%PORTDOCS%%%%DOCSDIR%%/xca-9.html
		21	%%PORTDOCS%%%%DOCSDIR%%/xca.html
		22	share/mime/packages/xca.xml
		23	share/pixmaps/xca-32x32.xpm
2	%%DATADIR%%/CA.xca	24	%%DATADIR%%/CA.xca
3	%%DATADIR%%/HTTPS_client.xca	25	%%DATADIR%%/HTTPS_client.xca
4	%%DATADIR%%/HTTPS_server.xca	26	%%DATADIR%%/HTTPS_server.xca
Lines 10-19 Link Here
10	%%DATADIR%%/xca_de.qm	32	%%DATADIR%%/xca_de.qm
11	%%DATADIR%%/xca_es.qm	33	%%DATADIR%%/xca_es.qm
12	%%DATADIR%%/xca_fr.qm	34	%%DATADIR%%/xca_fr.qm
		35	%%DATADIR%%/xca_hr.qm
13	%%DATADIR%%/xca_ru.qm	36	%%DATADIR%%/xca_ru.qm
14	%%DATADIR%%/xca_tr.qm	37	%%DATADIR%%/xca_tr.qm
15	%%DOCSDIR%%/xca.html
16	man/man1/xca.1.gz
17	share/applications/xca.desktop
18	share/mime/packages/xca.xml
19	share/pixmaps/xca-32x32.xpm