Date: Thu, 7 Aug 2014 23:30:51 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364331 - in head/security/zxid: . files Message-ID: <53e40c2b.210e.78c8d012@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Aug 7 23:30:51 2014 New Revision: 364331 URL: http://svnweb.freebsd.org/changeset/ports/364331 QAT: https://qat.redports.org/buildarchive/r364331/ Log: security/zxid: Upgrade version 1.05 => 1.18 PR: 192481 Submitted by: Ports Fury Added: head/security/zxid/files/patch-pkcs12.c (contents, props changed) head/security/zxid/files/patch-platform.h (contents, props changed) Deleted: head/security/zxid/files/patch-Makefile head/security/zxid/files/patch-smime.c Modified: head/security/zxid/Makefile head/security/zxid/distinfo head/security/zxid/pkg-descr head/security/zxid/pkg-plist Modified: head/security/zxid/Makefile ============================================================================== --- head/security/zxid/Makefile Thu Aug 7 23:20:54 2014 (r364330) +++ head/security/zxid/Makefile Thu Aug 7 23:30:51 2014 (r364331) @@ -2,57 +2,64 @@ # $FreeBSD$ PORTNAME= zxid -PORTVERSION= 1.05 -PORTREVISION= 1 +PORTVERSION= 1.18 CATEGORIES= security www MASTER_SITES= http://zxid.org/ MAINTAINER= ports@FreeBSD.org COMMENT= Open Source IdM for the Masses - SAML SSO -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl +LICENSE= APACHE20 -MAKE_JOBS_UNSAFE= yes +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -CFLAGS+= -D_LSEEK_DECLARED -fPIC -MAKE_ARGS= CC="${CC}" CURL_ROOT="${LOCALBASE}" LD="${CC}" \ - PREFIX="${PREFIX}" OPENSSL_ROOT="${OPENSSLBASE}" USES= gmake tar:tgz +USE_OPENSSL= yes USE_CSTD= gnu89 +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" \ + LD="${CC}" LDFLAGS="${LDFLAGS}" \ + PREFIX="${PREFIX}" OPENSSL_ROOT="${OPENSSLBASE}" \ + POSTLIBS="${LDFLAGS}" TARGET="${OPSYS:tl}" +ALL_TARGET= default smime libzxid.so.0.0 USE_LDCONFIG= yes -USE_OPENSSL= yes +MAKE_JOBS_UNSAFE= yes -ZXID_BINS= smime zxcall zxcot zxdecode zxencdectest zxid zxidhlo \ - zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple \ - zxidwsctool zxlogview zxpasswd +CFLAGS+= -I${LOCALBASE}/include -D_LSEEK_DECLARED -fPIC +LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes +BROKEN_powerpc= Does not build on ${ARCH} +BROKEN_sparc64= Does not build on ${ARCH} OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> +ZXID_BINS= smime zxcall zxcot zxdecode zxencdectest zxidhlo \ + zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple \ + zxidwsctool zxlogview zxpasswd post-patch: - @${REINPLACE_CMD} -e '/which gcc/d' \ - -e 's/ --export-all-symbols/ /g' \ - ${WRKSRC}/Makefile - -post-install: - ${MKDIR} ${PREFIX}/include/zxid/ - cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${ZXID_BINS} ${PREFIX}/bin/ - ${INSTALL_LIB} ${WRKSRC}/libzxid.a ${PREFIX}/lib/ - ${INSTALL_LIB} ${WRKSRC}/libzxid.so.0.0 ${PREFIX}/lib/libzxid.so.0 - ${LN} -sf libzxid.so.0 ${PREFIX}/lib/libzxid.so - cd ${WRKSRC}/ && ${INSTALL_DATA} *.h c/*.h ${PREFIX}/include/zxid/ -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} *.pd ${DOCSDIR}/ -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not install -.endif + @${REINPLACE_CMD} -e \ + '/^LIBS/s|-lpthread|-pthread| ; \ + /^SHARED/s|--export-all-symbols|| ; \ + /which gcc/d' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e \ + 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/zxidconf.c + +do-install: + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${ZXID_BINS} \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${PREFIX}/include/zx + ${LN} -sf ../zxid/zx.h ${STAGEDIR}${PREFIX}/include/zx/zx.h + @${MKDIR} ${STAGEDIR}${PREFIX}/include/zxid + (cd ${WRKSRC} && ${INSTALL_DATA} *.h c/*.h \ + ${STAGEDIR}${PREFIX}/include/zxid) + (cd ${WRKSRC} && ${INSTALL_DATA} libzxid.a \ + ${STAGEDIR}${PREFIX}/lib) + (cd ${WRKSRC} && ${INSTALL_LIB} libzxid.so.0.0 \ + ${STAGEDIR}${PREFIX}/lib) + ${LN} -sf libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib/libzxid.so + ${LN} -sf libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib/libzxid.so.0 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} *.pd \ + ${STAGEDIR}${DOCSDIR}) -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/zxid/distinfo ============================================================================== --- head/security/zxid/distinfo Thu Aug 7 23:20:54 2014 (r364330) +++ head/security/zxid/distinfo Thu Aug 7 23:30:51 2014 (r364331) @@ -1,2 +1,2 @@ -SHA256 (zxid-1.05.tgz) = 779de5245b026abfe73d4e7b9306c033c2dd600fc48c9d5eb0251f4c9914e190 -SIZE (zxid-1.05.tgz) = 1800009 +SHA256 (zxid-1.18.tgz) = 80cd65e0fd45d61cbf4f0a0e46c11f8dc7752979676d00ce89719ce3497ec393 +SIZE (zxid-1.18.tgz) = 2075055 Added: head/security/zxid/files/patch-pkcs12.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/zxid/files/patch-pkcs12.c Thu Aug 7 23:30:51 2014 (r364331) @@ -0,0 +1,13 @@ +--- pkcs12.c.orig ++++ pkcs12.c +@@ -95,6 +95,10 @@ + #define SMIME_INTERNALS /* we want also our internal helper functions */ + #include "smimeutil.h" + ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10000000L ++#define _STACK STACK ++#endif ++ + /* ================= P K C S 1 2 C O N V E R S I O N S ================ */ + /* Convert pem formatted certificate and private key into PKCS12 + * object suitable for importing to browsers. Added: head/security/zxid/files/patch-platform.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/zxid/files/patch-platform.h Thu Aug 7 23:30:51 2014 (r364331) @@ -0,0 +1,10 @@ +--- platform.h.orig 2013-11-27 10:56:48.000000000 +0900 ++++ platform.h 2014-07-28 07:51:37.000000000 +0900 +@@ -130,6 +130,7 @@ + * NOT MINGW nor WIN32CL (i.e. its Unix) */ + + #include <dirent.h> ++#include <sys/types.h> + + #ifdef __cplusplus + extern "C" { Modified: head/security/zxid/pkg-descr ============================================================================== --- head/security/zxid/pkg-descr Thu Aug 7 23:20:54 2014 (r364330) +++ head/security/zxid/pkg-descr Thu Aug 7 23:30:51 2014 (r364331) @@ -8,4 +8,4 @@ Scripting languages are supported using Java. The "full stack" nature of ZXID means it's self contained and has minimal external library dependencies (see downloads). -WWW: http://zxid.org/ +WWW: http://zxid.org/ Modified: head/security/zxid/pkg-plist ============================================================================== --- head/security/zxid/pkg-plist Thu Aug 7 23:20:54 2014 (r364330) +++ head/security/zxid/pkg-plist Thu Aug 7 23:30:51 2014 (r364331) @@ -3,7 +3,6 @@ bin/zxcall bin/zxcot bin/zxdecode bin/zxencdectest -bin/zxid bin/zxidhlo bin/zxidhlowsf bin/zxidhrxmlwsc @@ -13,15 +12,22 @@ bin/zxidsimple bin/zxidwsctool bin/zxlogview bin/zxpasswd +include/zx/zx.h +include/zxid/akbox.h +include/zxid/aktab.h include/zxid/errmac.h +include/zxid/hiios.h +include/zxid/hiproto.h include/zxid/logprint.h include/zxid/macglue.h include/zxid/platform.h +include/zxid/port.h include/zxid/saml2.h include/zxid/smimeutil.h include/zxid/tas3.h include/zxid/wsf.h include/zxid/yubikey.h +include/zxid/zx.h include/zxid/zx-a-data.h include/zxid/zx-ac-data.h include/zxid/zx-as-data.h @@ -86,7 +92,6 @@ include/zxid/zx-xenc-data.h include/zxid/zx-xml-data.h include/zxid/zx-xs-data.h include/zxid/zx-xsi-data.h -include/zxid/zx.h include/zxid/zx_ext_pt.h include/zxid/zxid.h include/zxid/zxidconf.h @@ -98,6 +103,7 @@ include/zxid/zxwsc.h lib/libzxid.a lib/libzxid.so lib/libzxid.so.0 +lib/libzxid.so.0.0 %%PORTDOCS%%%%DOCSDIR%%/apache.pd %%PORTDOCS%%%%DOCSDIR%%/doc-end.pd %%PORTDOCS%%%%DOCSDIR%%/doc-inc.pd @@ -125,3 +131,4 @@ lib/libzxid.so.0 %%PORTDOCS%%%%DOCSDIR%%/zxid-wsf.pd %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/zxid +@dirrm include/zx
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e40c2b.210e.78c8d012>