- Update to 0.8.1

- Pass maintainer to submitter

PR:		ports/142349
Submitted by:	freebsd@nagilum.org
Approved by:	Mark Foster <mark@foster.cc> (maintainer)

7 files changed, 62 insertions, 177 deletions

diff --git a/security/xca/Makefile b/security/xca/Makefile
index 442c50015e95..739a6eb5c87c 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	xca
-PORTVERSION=	0.6.4
+PORTVERSION=	0.8.1
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
-MAINTAINER=	mark@foster.cc
+MAINTAINER=	freebsd@nagilum.org
 COMMENT=	Graphical certification authority
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui moc_build uic_build qmake_build rcc_build linguist_build
+USE_AUTOTOOLS=	libltdl:22
 CC?=		gcc
 CXX?=		g++
 
@@ -34,7 +35,7 @@ post-patch:
 	@echo "CPPFLAGS=-I. -I.. -I${WRKSRC}/ui -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include" > ${WRKSRC}/Local.mak
 	@echo "CFLAGS= ${CFLAGS} -Wall -ggdb" >> ${WRKSRC}/Local.mak
 	@echo "LDFLAGS= ${LDFLAGS} -L${QT_LIBDIR} -L${LOCALBASE}/lib" >> ${WRKSRC}/Local.mak
-	@echo "LIBS= -lQtGui ${PTHREAD_LIBS} -lcrypto" >> ${WRKSRC}/Local.mak
+	@echo "LIBS= -lQtGui ${PTHREAD_LIBS} -lcrypto -lltdl" >> ${WRKSRC}/Local.mak
 	@echo "MOC=${MOC}" >> ${WRKSRC}/Local.mak
 	@echo "UIC=${QT_PREFIX}/bin/uic-qt4" >> ${WRKSRC}/Local.mak
 	@echo "RCC=${LOCALBASE}/bin/rcc"  >> ${WRKSRC}/Local.mak
@@ -45,9 +46,11 @@ post-patch:
 	@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 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/import.cpp
 
 .include <bsd.port.post.mk>
diff --git a/security/xca/distinfo b/security/xca/distinfo
index 90f465baf52d..bee50c0628f2 100644
--- a/security/xca/distinfo
+++ b/security/xca/distinfo
@@ -1,3 +1,3 @@
-MD5 (xca-0.6.4.tar.gz) = f805a2e094436f976c7a4cda5980027e
-SHA256 (xca-0.6.4.tar.gz) = 63e5992d461cbea38fb5433c989ee1cc73d7dac5162e57d6e70a7735d9f80ed4
-SIZE (xca-0.6.4.tar.gz) = 266574
+MD5 (xca-0.8.1.tar.gz) = ca87fd1af19ea2d90ac5aca1c296dd21
+SHA256 (xca-0.8.1.tar.gz) = 3261f5899450ef8e1120a020364416424701229679d2e5b0bb9c73bed6238029
+SIZE (xca-0.8.1.tar.gz) = 598962
diff --git a/security/xca/files/patch-compiler-errors b/security/xca/files/patch-compiler-errors
index d61d1e17733d..952ae8fe648e 100644
--- a/security/xca/files/patch-compiler-errors
+++ b/security/xca/files/patch-compiler-errors
@@ -1,138 +1,11 @@
-diff --git ./configure ./configure
-index fd1dde7..7c79eaa 100755
---- ./configure
-+++ ./configure
-@@ -141,8 +141,8 @@ cat >conftest.c <<EOF
- #include <Qt/qglobal.h>
- 
- int main(){
--  printf("\nThe Versions of the used libraries are:\n\t%s\n\tQT: %s\n",
--	 OPENSSL_VERSION_TEXT, QT_VERSION_STR );
-+  printf("\nThe Versions of the used libraries are:\n\t%s 0x%lxL\n\tQT: %s\n",
-+	 OPENSSL_VERSION_TEXT, OPENSSL_VERSION_NUMBER, QT_VERSION_STR );
-   if (QT_VERSION < 0x040001) {
- 	printf("You need Qt 4 or higher\n");
- 	return 1;
-diff --git ./lib/pki_x509.cpp ./lib/pki_x509.cpp
-index 9b21a27..84d8513 100644
---- ./lib/pki_x509.cpp
-+++ ./lib/pki_x509.cpp
-@@ -339,8 +339,9 @@ void pki_x509::writeDefault(const QString fname)
- void pki_x509::writeCert(const QString fname, bool PEM, bool append)
- {
- 	FILE *fp;
--	char *_a = "a", *_w="w", *p = _w;
--	if (append) p=_a;
-+	const char *p = "w";
-+	if (append)
-+		p = "a";
- 	fp = fopen(fname.toAscii(), p);
- 	if (fp != NULL) {
- 		if (cert){
-diff --git ./lib/x509rev.cpp ./lib/x509rev.cpp
-index 3af4b44..aa60dee 100644
---- ./lib/x509rev.cpp
-+++ ./lib/x509rev.cpp
-@@ -7,16 +7,23 @@
- 
- #include "x509rev.h"
- 
--#if OPENSSL_VERSION_NUMBER >= 0x00908000L
--#define X509_REVOKED_dup(x5r) \
--	ASN1_dup_of (X509_REVOKED, i2d_X509_REVOKED, d2i_X509_REVOKED, x5r)
- 
--#else
--#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup( \
--	(int (*)(...))i2d_X509_REVOKED, \
--	(char *(*)(...))d2i_X509_REVOKED, \
--	(char *)x5r)
--#endif
-+static X509_REVOKED *X509_REVOKED_dup(const X509_REVOKED *n)
-+{
-+        int len;
-+        X509_REVOKED *ret;
-+	unsigned char *buf, *p;
-+	const unsigned char *cp;
-+
-+        len = i2d_X509_REVOKED((X509_REVOKED *)n, NULL);
-+	buf = (unsigned char *)OPENSSL_malloc(len);
-+        p = buf;
-+        i2d_X509_REVOKED((X509_REVOKED *)n, &p);
-+        cp = buf;
-+        ret = d2i_X509_REVOKED(NULL, &cp, len);
-+        OPENSSL_free(buf);
-+        return(ret);
-+}
- 
- x509rev::x509rev()
- {
-@@ -25,7 +32,7 @@ x509rev::x509rev()
- 
- x509rev::x509rev(const X509_REVOKED *n)
- {
--	rev = X509_REVOKED_dup((X509_REVOKED *)n);
-+	rev = X509_REVOKED_dup(n);
- }
- 
- x509rev::x509rev(const x509rev &n)
-@@ -43,7 +50,7 @@ x509rev &x509rev::set(const X509_REVOKED *n)
- {
- 	if (rev != NULL)
- 		X509_REVOKED_free(rev);
--	rev = X509_REVOKED_dup((X509_REVOKED *)n);
-+	rev = X509_REVOKED_dup(n);
- 	return *this;
- }
- 
-diff --git ./widgets/ExportCert.cpp ./widgets/ExportCert.cpp
-index 1069e4b..6159dcc 100644
---- ./widgets/ExportCert.cpp
-+++ ./widgets/ExportCert.cpp
-@@ -46,7 +46,7 @@ void ExportCert::on_fileBut_clicked()
- 
- void ExportCert::on_exportFormat_activated(int)
- {
--	char *suffix[] = { "crt", "crt", "crt", "crt", "cer",
-+	const char *suffix[] = { "crt", "crt", "crt", "crt", "cer",
- 		"p7b", "p7b", "p7b", "p7b", "p12", "p12", "pem", "pem" };
- 	int selected = exportFormat->currentIndex();
- 	QString fn = filename->text();
-diff --git ./widgets/ExportDer.cpp ./widgets/ExportDer.cpp
-index 8826b7e..f03c686 100644
---- ./widgets/ExportDer.cpp
-+++ ./widgets/ExportDer.cpp
-@@ -39,7 +39,7 @@ void ExportDer::on_fileBut_clicked()
- 
- void ExportDer::on_exportFormat_activated(int)
- {
--	char *suffix[] = { "pem", "der" };
-+	const char *suffix[] = { "pem", "der" };
- 	int selected = exportFormat->currentIndex();
- 	QString fn = filename->text();
- 	QString nfn = fn.left(fn.lastIndexOf('.')+1) + suffix[selected];
-diff --git ./widgets/ExportKey.cpp ./widgets/ExportKey.cpp
-index ecf0598..f2e7de1 100644
---- ./widgets/ExportKey.cpp
-+++ ./widgets/ExportKey.cpp
-@@ -65,7 +65,7 @@ void ExportKey::canEncrypt()
- 
- void ExportKey::on_exportFormat_activated(int c)
- {
--	char *suffix[] = { "pem", "der" };
-+	const char *suffix[] = { "pem", "der" };
- 
- 	QString fn = filename->text();
- 	QString nfn = fn.left(fn.lastIndexOf('.')+1) + suffix[c];
-diff --git ./widgets/hashBox.cpp ./widgets/hashBox.cpp
-index cb4fa3a..3a22a82 100644
---- ./widgets/hashBox.cpp
-+++ ./widgets/hashBox.cpp
-@@ -17,7 +17,7 @@ int hashBox::default_md = 2; /* SHA1 */
- #endif
- 
- static struct {
--	char *name;
-+	const char *name;
- 	const EVP_MD *md;
- } hashalgos[] = {
- 	{ "MD 2", EVP_md2() },
+--- lib/db.cpp.orig	2009-12-10 18:44:03.000000000 +0100
++++ lib/db.cpp	2010-01-05 11:00:43.000000000 +0100
+@@ -153,7 +153,7 @@
+ 		return -1;
+ 	}
+ 	if (!verify_magic()){
+-		printf("Garbage found at %lu\n", head_offset);
++		printf("Garbage found at %lu\n", (long unsigned int) head_offset);
+ 		head_offset+=4;
+ 		return next(flag);
+ 	}
diff --git a/security/xca/files/patch-doc-Makefile b/security/xca/files/patch-doc-Makefile
index d285c41c8337..8d39952f1ee9 100644
--- a/security/xca/files/patch-doc-Makefile
+++ b/security/xca/files/patch-doc-Makefile
@@ -1,29 +1,30 @@
---- doc/Makefile.orig	Tue Jun  5 22:16:31 2007
-+++ doc/Makefile	Tue Jun  5 22:54:04 2007
-@@ -5,14 +5,11 @@
- DELFILES=*.html xca.1.gz 
- all: doc
- mandir=man
+--- doc/Makefile.orig	2009-12-10 18:44:03.000000000 +0100
++++ doc/Makefile	2010-01-05 14:00:09.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ DELFILES=xca*.html xca.1.gz
+ 
 -doc: xca.1.gz xca.html
 +doc: xca.1.gz
+ include $(TOPDIR)/Rules.mak
  
- xca.1.gz: xca.1
+ mandir=man
+@@ -13,8 +13,7 @@
  	gzip -9 <$^ >$@
  
--xca.html: xca.sgml
+ xca.html: xca.sgml
+-	echo '<h1>No documentation generated</h1>' > $@
 -	$(LINUXDOC) -B html $<
--
++	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)$(prefix)/share/xca \
- 		$(destdir)$(prefix)/$(mandir)/man1
-@@ -21,10 +18,6 @@
+ 	install -m 755 -d $(destdir)$(docdir) \
+@@ -22,8 +21,4 @@
+ 	install -m 644 xca*.html $(destdir)$(docdir)
+ 	install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
  
- clean:
- 	$(RM) xca.1.gz
--
 -app: xca.html
 -	mkdir -p $(APPDIR)/Resources
 -	install -m 644 xca*.html $(APPDIR)/Resources
- 
- include $(TOPDIR)/Local.mak
+-
  
diff --git a/security/xca/files/patch-doc-xca.html b/security/xca/files/patch-doc-xca.html
deleted file mode 100644
index d65457bffd0e..000000000000
--- a/security/xca/files/patch-doc-xca.html
+++ /dev/null
@@ -1,5 +0,0 @@
---- doc/xca.html	Tue Jun  5 22:44:01 2007
-+++ doc/xca.html	Tue Jun  5 22:44:35 2007
-@@ -0,0 +1,2 @@
-+The documentation for XCA can be viewed online at:
-+http://xca.sourceforge.net/
diff --git a/security/xca/files/patch-img-Makefile b/security/xca/files/patch-img-Makefile
new file mode 100644
index 000000000000..a4c52ac5f338
--- /dev/null
+++ b/security/xca/files/patch-img-Makefile
@@ -0,0 +1,11 @@
+--- img/Makefile.orig	2009-12-10 18:44:03.000000000 +0100
++++ img/Makefile	2010-01-05 12:25:31.000000000 +0100
+@@ -15,7 +15,7 @@
+ 	echo $(OBJS)
+ 
+ install:
+-	install -D -m 644 key.xpm $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
++	install -d -m 755 $(destdir)$(prefix)/share/pixmaps && install -m 644 key.xpm $(destdir)$(prefix)/share/pixmaps/xca-32x32.xpm
+ 
+ imgres.cpp: imgres.rcc
+ 	$(RCC) -o $@ $<
diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist
index c83943323e6e..c9142374e3e8 100644
--- a/security/xca/pkg-plist
+++ b/security/xca/pkg-plist
@@ -1,15 +1,17 @@
 @comment $FreeBSD$
 bin/xca
-share/xca/CA.xca
-share/xca/HTTPS_client.xca
-share/xca/HTTPS_server.xca
-share/xca/aia.txt
-share/xca/dn.txt
-share/xca/eku.txt
-share/xca/oids.txt
-share/xca/xca_de.qm
-share/xca/xca_es.qm
-share/xca/xca.html
+%%DATADIR%%/CA.xca
+%%DATADIR%%/HTTPS_client.xca
+%%DATADIR%%/HTTPS_server.xca
+%%DATADIR%%/aia.txt
+%%DATADIR%%/dn.txt
+%%DATADIR%%/eku.txt
+%%DATADIR%%/oids.txt
+%%DATADIR%%/xca_de.qm
+%%DATADIR%%/xca_es.qm
+%%DOCSDIR%%/xca.html
 share/applications/xca.desktop
-@dirrm share/xca
+share/pixmaps/xca-32x32.xpm
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
 @dirrmtry share/applications