svn commit: r370985 - in head/security/xca: . files

[Guido Falsi]

Author: madpilot
Date: Thu Oct 16 09:15:54 2014
New Revision: 370985
URL: https://svnweb.freebsd.org/changeset/ports/370985
QAT: https://qat.redports.org/buildarchive/r370985/

Log:
  - Fix runtime error when used with OpenSSL 1.0.1i [1]
  - While here, Fix LICENSE, rename patch files and remove dirrms
  
  PR:		193988
  Submitted by:	me
  Obtained from:	upstream git repo [1]
  Approved by:	maintainer timeout

Added:
  head/security/xca/files/patch-doc__Makefile
     - copied unchanged from r370984, head/security/xca/files/patch-doc-Makefile
  head/security/xca/files/patch-img__Makefile
     - copied unchanged from r369265, head/security/xca/files/patch-img-Makefile
  head/security/xca/files/patch-lib__x509v3ext.cpp   (contents, props changed)
Deleted:
  head/security/xca/files/patch-doc-Makefile
  head/security/xca/files/patch-img-Makefile
Modified:
  head/security/xca/Makefile
  head/security/xca/pkg-plist

Modified: head/security/xca/Makefile
==============================================================================
--- head/security/xca/Makefile	Thu Oct 16 09:00:57 2014	(r370984)
+++ head/security/xca/Makefile	Thu Oct 16 09:15:54 2014	(r370985)
@@ -3,14 +3,14 @@
 
 PORTNAME=	xca
 PORTVERSION=	0.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	freebsd at nagilum.org
 COMMENT=	Graphical certification authority
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 

Copied: head/security/xca/files/patch-doc__Makefile (from r370984, head/security/xca/files/patch-doc-Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/xca/files/patch-doc__Makefile	Thu Oct 16 09:15:54 2014	(r370985, copy of r370984, head/security/xca/files/patch-doc-Makefile)
@@ -0,0 +1,32 @@
+--- doc/Makefile.orig	2012-05-12 11:37:14.000000000 +0200
++++ doc/Makefile	2012-05-14 11:19:34.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ 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.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 -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
+-
+ 

Copied: head/security/xca/files/patch-img__Makefile (from r369265, head/security/xca/files/patch-img-Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/xca/files/patch-img__Makefile	Thu Oct 16 09:15:54 2014	(r370985, copy of r369265, head/security/xca/files/patch-img-Makefile)
@@ -0,0 +1,11 @@
+--- img/Makefile.orig	2011-11-07 07:09:32.000000000 +0100
++++ img/Makefile	2011-11-23 11:15:40.000000000 +0100
+@@ -13,7 +13,7 @@
+ sinclude .depend
+ 
+ install: xca-32x32.xpm
+-	install -D -m 644 $^ $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
++	install -d -m 755 $(destdir)$(prefix)/share/pixmaps && install -m 644 $^ $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
+ 
+ imgres.cpp: imgres.rcc
+ 	@$(PRINT) "  RCC    [$(BASENAME)] $@"

Added: head/security/xca/files/patch-lib__x509v3ext.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/xca/files/patch-lib__x509v3ext.cpp	Thu Oct 16 09:15:54 2014	(r370985)
@@ -0,0 +1,20 @@
+--- lib/x509v3ext.cpp.orig	2012-05-12 09:37:14 UTC
++++ lib/x509v3ext.cpp
+@@ -27,6 +27,8 @@
+ x509v3ext::x509v3ext(const x509v3ext &n)
+ {
+ 	ext = NULL;
++	if (!n.isValid())
++		return;
+ 	set(n.ext);
+ }
+ 
+@@ -743,7 +745,7 @@
+ 
+ bool x509v3ext::isValid() const
+ {
+-	return ext->value->length > 0 &&
++	return ext && ext->value && ext->value->length > 0 &&
+ 		OBJ_obj2nid(ext->object) != NID_undef;
+ }
+ 

Modified: head/security/xca/pkg-plist
==============================================================================
--- head/security/xca/pkg-plist	Thu Oct 16 09:00:57 2014	(r370984)
+++ head/security/xca/pkg-plist	Thu Oct 16 09:15:54 2014	(r370985)
@@ -17,7 +17,3 @@ man/man1/xca.1.gz
 share/applications/xca.desktop
 share/mime/packages/xca.xml
 share/pixmaps/xca-32x32.xpm
- at dirrm %%DATADIR%%
- at dirrm %%DOCSDIR%%
- at dirrmtry share/mime/packages
- at dirrmtry share/mime