- Update to 1.05

PR:		ports/163738
Submitted by:	sunpoet (myself)
Approved by:	clsung (maintainer, via IRC)
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2012-02-12 14:06:02 +00:00
parent d305e8aeec
commit 388b3e34b0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=291034
6 changed files with 121 additions and 44 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= zxid
PORTVERSION= 0.38
PORTREVISION= 1
PORTVERSION= 1.05
CATEGORIES= security www
MASTER_SITES= http://zxid.org/
EXTRACT_SUFX= .tgz
@ -19,24 +18,28 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
MAKE_JOBS_UNSAFE= yes
MAKE_ARGS+= CC="${CC}" CURL_ROOT="${LOCALBASE}" LD="${CC}" \
CFLAGS+= -D_LSEEK_DECLARED -fPIC
MAKE_ARGS= CC="${CC}" CURL_ROOT="${LOCALBASE}" LD="${CC}" \
PREFIX="${PREFIX}" OPENSSL_ROOT="${OPENSSLBASE}"
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_OPENSSL= yes
ZXID_BINS= smime zxcall zxcot zxdecode zxencdectest zxid zxidhlo \
zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple \
zxidwsctool zxlogview zxpasswd
post-install:
${MKDIR} ${PREFIX}/include/zxid
${INSTALL_PROGRAM} ${WRKSRC}/zxidhlo ${PREFIX}/bin/
${INSTALL_PROGRAM} ${WRKSRC}/zxididp ${PREFIX}/bin/
${INSTALL_PROGRAM} ${WRKSRC}/libzxid.a ${PREFIX}/lib/
${INSTALL_PROGRAM} ${WRKSRC}/libzxid.so.0.0 ${PREFIX}/lib/libzxid.so.0
${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/)
cd ${WRKSRC}/ && ${INSTALL_DATA} *.h c/*.h ${PREFIX}/include/zxid/
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/
cd ${WRKSRC}/ && ${INSTALL_DATA} *.pd ${DOCSDIR}/
.endif
.include <bsd.port.pre.mk>

View file

@ -1,2 +1,2 @@
SHA256 (zxid-0.38.tgz) = b6883fb5771b2d16591ab4e624fa78ceaceec45bc608b8c348947773bb2a6b91
SIZE (zxid-0.38.tgz) = 3091109
SHA256 (zxid-1.05.tgz) = 779de5245b026abfe73d4e7b9306c033c2dd600fc48c9d5eb0251f4c9914e190
SIZE (zxid-1.05.tgz) = 1800009

View file

@ -1,22 +1,24 @@
--- Makefile.orig 2009-10-16 19:37:47.000000000 +0400
+++ Makefile 2009-10-30 00:02:20.000000000 +0300
@@ -31,13 +31,13 @@
--- Makefile.orig 2011-07-25 03:56:45.000000000 +0800
+++ Makefile 2011-12-29 17:35:47.379562021 +0800
@@ -36,7 +36,7 @@
default: seehelp precheck zxid zxidhlo zxididp zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp zxdecode zxcot
default: seehelp precheck zxid zxidhlo zxididp zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp zxdecode zxcot zxpasswd zxcall zxencdectest
-all: seehelp precheck precheck_apache zxid zxidhlo zxididp zxidsimple zxlogview samlmod phpzxid javazxid apachezxid zxdecode zxcot smime
+all: seehelp precheck zxid zxidhlo zxididp zxidsimple zxlogview zxdecode zxcot smime
-all: default precheck_apache samlmod phpzxid javazxid apachezxid smime zxidwspcgi
+all: default smime
ZXIDREL=0.38
ZXIDVERSION=0x000038
### This is the authorative spot to set version number. Document in Changes file.
### c/zxidvers.h is generated from these, see `make updatevers'
@@ -44,7 +44,7 @@
ZXIDREL=1.02
### Where package is installed (use `make PREFIX=/your/path' to change)
-PREFIX=/usr/local/zxid/$(ZXIDREL)
+PREFIX?=/usr/local/zxid/$(ZXIDREL)
-PREFIX=/var/zxid/$(ZXIDREL)
+PREFIX?=/var/zxid/$(ZXIDREL)
### Where runtime configuration and temporary data is kept.
### If you change the following, be sure to edit zxidconf.h as
@@ -64,8 +64,8 @@
@@ -72,8 +72,8 @@
###
TOP=$(shell pwd)
@ -27,32 +29,45 @@
PHP_CONFIG=php-config
CSHARP_CONFIG=true
PY_CONFIG=true
@@ -82,11 +82,11 @@
@@ -90,14 +90,14 @@
SWIG=swig
AR=ar -crs
ARX=ar -x
-CC=gcc
-LD=gcc
+CC?=gcc
+LD?=gcc
GCOV=gcov
LCOV=lcov
GENHTML=genhtml
-SHARED_FLAGS=-shared --export-all-symbols -Wl,-whole-archive -Wl,--allow-multiple-definition
-SHARED_CLOSE=-Wl,-no-whole-archive
-CFLAGS=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing
+CC?=gcc
+LD?=gcc
+SHARED_FLAGS+=-shared --export-all-symbols -Wl,-whole-archive -Wl,--allow-multiple-definition
+SHARED_CLOSE+=-Wl,-no-whole-archive
+CFLAGS+=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing
+SHARED_FLAGS?=-shared --export-all-symbols -Wl,-whole-archive -Wl,--allow-multiple-definition
+SHARED_CLOSE?=-Wl,-no-whole-archive
+CFLAGS?=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing
#CFLAGS += -Os # gcc-3.4.6 miscompiles with -Os on ix86
CFLAGS += -Wall -Wno-parentheses -DMAYBE_UNUSED='__attribute__ ((unused))'
CFLAGS += -ffunction-sections -fdata-sections
@@ -1090,11 +1090,6 @@
#LDFLAGS += -Wl,--gc-sections
@@ -1318,7 +1318,7 @@
endif
install: zxid libzxid.a libzxid.so.0.0 dir
libzxid.so.0.0: $(LIBZXID_A)
- $(LD) $(OUTOPT)libzxid.so.0.0 $(SHARED_FLAGS) $^ $(SHARED_CLOSE) -lcurl -lssl -lcrypt
+ $(LD) $(OUTOPT)libzxid.so.0.0 $(SHARED_FLAGS) $^ $(SHARED_CLOSE) $(LIBS) -lcurl -lssl -lcrypt
zxid.dll zxidimp.lib: $(LIBZXID_A)
$(LD) $(OUTOPT)zxid.dll $(SHARED_FLAGS) -Wl,--output-def,zxid.def,--out-implib,zxidimp.lib $^ $(SHARED_CLOSE) $(WIN_LIBS) -mdll
@@ -1604,12 +1604,6 @@
install: zxid $(LIBZXID_A) libzxid.so.0.0 dir
@$(ECHO) "===== Installing in $(PREFIX) (to change do make install PREFIX=/your/path)"
- -mkdir -p $(PREFIX) $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/zxid
- cp zxidhlo zxididp $(PREFIX)/bin
- cp libzxid.a libzxid.so* $(PREFIX)/lib
- cp libzxid.so.0.0 $(PREFIX)/lib
- cp *.h c/*.h $(PREFIX)/include/zxid
- -mkdir -p $(PREFIX) $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/zxid $(PREFIX)/doc
- $(CP) zxmkdirs.sh zxcall zxpasswd zxcot zxlogview zxdecode zxencdectest zxcleanlogs.sh zximport-htpasswd.pl zximport-ldif.pl xml-pretty.pl diffy.pl smime send.pl xacml2ldif.pl mockpdp.pl env.cgi zxid-java.sh zxidatsel.pl zxidnewuser.pl zxidcot.pl zxiddash.pl zxidexplo.pl zxidhlo zxidhlo.pl zxidhlo.php zxidhlo.sh zxidhlo-java.sh zxidhlocgi.php zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple zxidwsctool zxidwspcgi zxtest.pl zxsizeof $(PREFIX)/bin
- $(CP) $(LIBZXID_A) libzxid.so* $(PREFIX)/lib
- $(CP) libzxid.so.0.0 $(PREFIX)/lib
- $(CP) *.h c/*.h $(PREFIX)/include/zxid
- $(CP) *.pd *.dia $(PREFIX)/doc
@$(ECHO) "You will need to copy zxidhlo binary where your web server can find it and"
@$(ECHO) "make sure your web server is configured to recognize zxidhlo as a CGI script."
@$(ECHO)

View file

@ -1,5 +1,5 @@
--- smime.c.orig 2009-10-16 19:37:47.000000000 +0400
+++ smime.c 2009-10-29 23:46:33.000000000 +0300
--- smime.c.orig 2011-07-01 22:26:07.000000000 +0800
+++ smime.c 2011-07-13 10:41:01.570539385 +0800
@@ -94,9 +94,6 @@
#include <stdio.h>
#include <string.h>

View file

@ -0,0 +1,10 @@
--- zx.h.orig 2011-07-25 03:56:45.000000000 +0800
+++ zx.h 2011-12-29 17:00:27.394555276 +0800
@@ -25,6 +25,7 @@
#include <memory.h>
#include <string.h>
#include <stdarg.h>
+#include <limits.h>
#ifdef USE_OPENSSL
#include <openssl/x509.h>

View file

@ -1,13 +1,27 @@
@comment $FreeBSD$
bin/smime
bin/zxcall
bin/zxcot
bin/zxdecode
bin/zxencdectest
bin/zxid
bin/zxidhlo
bin/zxidhlowsf
bin/zxidhrxmlwsc
bin/zxidhrxmlwsp
bin/zxididp
bin/zxidsimple
bin/zxidwsctool
bin/zxlogview
bin/zxpasswd
include/zxid/errmac.h
include/zxid/logprint.h
include/zxid/macglue.h
include/zxid/platform.h
include/zxid/saml2.h
include/zxid/smimeutil.h
include/zxid/tas3.h
include/zxid/wsf.h
include/zxid/yubikey.h
include/zxid/zx-a-data.h
include/zxid/zx-ac-data.h
include/zxid/zx-as-data.h
@ -32,6 +46,7 @@ include/zxid/zx-gl-data.h
include/zxid/zx-hrxml-data.h
include/zxid/zx-idhrxml-data.h
include/zxid/zx-idp-data.h
include/zxid/zx-idpdisc-data.h
include/zxid/zx-im-data.h
include/zxid/zx-is-data.h
include/zxid/zx-is12-data.h
@ -49,10 +64,13 @@ include/zxid/zx-sa11-data.h
include/zxid/zx-sbf-data.h
include/zxid/zx-sec-data.h
include/zxid/zx-sec12-data.h
include/zxid/zx-shibmd-data.h
include/zxid/zx-shps-data.h
include/zxid/zx-sp-data.h
include/zxid/zx-sp11-data.h
include/zxid/zx-subs-data.h
include/zxid/zx-tas3-data.h
include/zxid/zx-tas3sol-data.h
include/zxid/zx-wsc-data.h
include/zxid/zx-wsp-data.h
include/zxid/zx-wsse-data.h
@ -61,18 +79,49 @@ include/zxid/zx-wsu-data.h
include/zxid/zx-xa-data.h
include/zxid/zx-xac-data.h
include/zxid/zx-xasa-data.h
include/zxid/zx-xasacd1-data.h
include/zxid/zx-xasp-data.h
include/zxid/zx-xaspcd1-data.h
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
include/zxid/zxidnoswig.h
include/zxid/zxidpriv.h
include/zxid/zxidutil.h
include/zxid/zxidvers.h
include/zxid/zxwsc.h
lib/libzxid.a
lib/libzxid.so
lib/libzxid.so.0
@dirrmtry include/zxid
%%PORTDOCS%%%%DOCSDIR%%/apache.pd
%%PORTDOCS%%%%DOCSDIR%%/doc-end.pd
%%PORTDOCS%%%%DOCSDIR%%/doc-inc.pd
%%PORTDOCS%%%%DOCSDIR%%/mediawiki-zxid.pd
%%PORTDOCS%%%%DOCSDIR%%/mod_auth_saml.pd
%%PORTDOCS%%%%DOCSDIR%%/ref-inc.pd
%%PORTDOCS%%%%DOCSDIR%%/schemata.pd
%%PORTDOCS%%%%DOCSDIR%%/testplan.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-book.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-compile.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-conf.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-cot.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-faq.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-idp.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-install.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-java.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-license.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-log.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-perl.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-php.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-raw.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-ref.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-simple.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-tas3.pd
%%PORTDOCS%%%%DOCSDIR%%/zxid-wsf.pd
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/zxid