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

(-)Makefile (-13 / +20 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	zxid
8
PORTNAME=	zxid
9
PORTVERSION=	0.38
9
PORTVERSION=	1.02
10
PORTREVISION=	1
11
CATEGORIES=	security www
10
CATEGORIES=	security www
12
MASTER_SITES=	http://zxid.org/
11
MASTER_SITES=	http://zxid.org/
13
EXTRACT_SUFX=	.tgz
12
EXTRACT_SUFX=	.tgz
Lines 19-42 Link Here
19
18
20
MAKE_JOBS_UNSAFE=	yes
19
MAKE_JOBS_UNSAFE=	yes
21
20
22
MAKE_ARGS+=	CC="${CC}" CURL_ROOT="${LOCALBASE}" LD="${CC}" \
21
CFLAGS+=	-D_LSEEK_DECLARED -fPIC
22
MAKE_ARGS=	CC="${CC}" CURL_ROOT="${LOCALBASE}" LD="${CC}" \
23
		PREFIX="${PREFIX}" OPENSSL_ROOT="${OPENSSLBASE}"
23
		PREFIX="${PREFIX}" OPENSSL_ROOT="${OPENSSLBASE}"
24
USE_GMAKE=	yes
24
USE_GMAKE=	yes
25
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
26
USE_OPENSSL=	yes
26
USE_OPENSSL=	yes
27
27
28
post-install:
28
ZXID_BINS=	smime zxcall zxcot zxdecode zxencdectest zxid zxidhlo \
29
29
		zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple \
30
	${MKDIR} ${PREFIX}/include/zxid
30
		zxidwsctool zxlogview zxpasswd
31
31
32
	${INSTALL_PROGRAM} ${WRKSRC}/zxidhlo ${PREFIX}/bin/
32
post-patch:
33
	${INSTALL_PROGRAM} ${WRKSRC}/zxididp ${PREFIX}/bin/
33
#	@${REINPLACE_CMD} -e 's|#include <stdio.h>|#include <unistd.h>|' ${WRKSRC}/zxid.c
34
#	@${REINPLACE_CMD} -e '/int lseek/ s|int offset|off_t offset|' ${WRKSRC}/platform.h
34
35
35
	${INSTALL_PROGRAM} ${WRKSRC}/libzxid.a      ${PREFIX}/lib/
36
post-install:
36
	${INSTALL_PROGRAM} ${WRKSRC}/libzxid.so.0.0 ${PREFIX}/lib/libzxid.so.0
37
	${MKDIR} ${PREFIX}/include/zxid/
38
	cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${ZXID_BINS} ${PREFIX}/bin/
39
	${INSTALL_LIB} ${WRKSRC}/libzxid.a ${PREFIX}/lib/
40
	${INSTALL_LIB} ${WRKSRC}/libzxid.so.0.0 ${PREFIX}/lib/libzxid.so.0
37
	${LN} -sf libzxid.so.0 ${PREFIX}/lib/libzxid.so
41
	${LN} -sf libzxid.so.0 ${PREFIX}/lib/libzxid.so
38
42
	cd ${WRKSRC}/ && ${INSTALL_DATA} *.h c/*.h ${PREFIX}/include/zxid/
39
	(cd ${WRKSRC} && ${INSTALL_DATA} *.h c/*.h ${PREFIX}/include/zxid/)
43
.if !defined(NOPORTDOCS)
44
	${MKDIR} ${DOCSDIR}/
45
	cd ${WRKSRC}/ && ${INSTALL_DATA} *.pd ${DOCSDIR}/
46
.endif
40
47
41
.include <bsd.port.pre.mk>
48
.include <bsd.port.pre.mk>
42
49
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (zxid-0.38.tgz) = b6883fb5771b2d16591ab4e624fa78ceaceec45bc608b8c348947773bb2a6b91
1
SHA256 (zxid-1.02.tgz) = 4e4170446892db01f2605a1bc342045b6d3b6ddf3598a911b1a26d507950732b
2
SIZE (zxid-0.38.tgz) = 3091109
2
SIZE (zxid-1.02.tgz) = 1781540
(-)pkg-plist (-2 / +51 lines)
Lines 1-13 Link Here
1
@comment $FreeBSD: ports/security/zxid/pkg-plist,v 1.4 2009/12/18 03:57:53 clsung Exp $
1
bin/smime
2
bin/zxcall
3
bin/zxcot
4
bin/zxdecode
5
bin/zxencdectest
6
bin/zxid
2
bin/zxidhlo
7
bin/zxidhlo
8
bin/zxidhlowsf
9
bin/zxidhrxmlwsc
10
bin/zxidhrxmlwsp
3
bin/zxididp
11
bin/zxididp
12
bin/zxidsimple
13
bin/zxidwsctool
14
bin/zxlogview
15
bin/zxpasswd
4
include/zxid/errmac.h
16
include/zxid/errmac.h
5
include/zxid/logprint.h
17
include/zxid/logprint.h
6
include/zxid/macglue.h
18
include/zxid/macglue.h
7
include/zxid/platform.h
19
include/zxid/platform.h
8
include/zxid/saml2.h
20
include/zxid/saml2.h
9
include/zxid/smimeutil.h
21
include/zxid/smimeutil.h
22
include/zxid/tas3.h
10
include/zxid/wsf.h
23
include/zxid/wsf.h
24
include/zxid/yubikey.h
11
include/zxid/zx-a-data.h
25
include/zxid/zx-a-data.h
12
include/zxid/zx-ac-data.h
26
include/zxid/zx-ac-data.h
13
include/zxid/zx-as-data.h
27
include/zxid/zx-as-data.h
Lines 32-37 Link Here
32
include/zxid/zx-hrxml-data.h
46
include/zxid/zx-hrxml-data.h
33
include/zxid/zx-idhrxml-data.h
47
include/zxid/zx-idhrxml-data.h
34
include/zxid/zx-idp-data.h
48
include/zxid/zx-idp-data.h
49
include/zxid/zx-idpdisc-data.h
35
include/zxid/zx-im-data.h
50
include/zxid/zx-im-data.h
36
include/zxid/zx-is-data.h
51
include/zxid/zx-is-data.h
37
include/zxid/zx-is12-data.h
52
include/zxid/zx-is12-data.h
Lines 49-58 Link Here
49
include/zxid/zx-sbf-data.h
64
include/zxid/zx-sbf-data.h
50
include/zxid/zx-sec-data.h
65
include/zxid/zx-sec-data.h
51
include/zxid/zx-sec12-data.h
66
include/zxid/zx-sec12-data.h
67
include/zxid/zx-shibmd-data.h
52
include/zxid/zx-shps-data.h
68
include/zxid/zx-shps-data.h
53
include/zxid/zx-sp-data.h
69
include/zxid/zx-sp-data.h
54
include/zxid/zx-sp11-data.h
70
include/zxid/zx-sp11-data.h
55
include/zxid/zx-subs-data.h
71
include/zxid/zx-subs-data.h
72
include/zxid/zx-tas3-data.h
73
include/zxid/zx-tas3sol-data.h
56
include/zxid/zx-wsc-data.h
74
include/zxid/zx-wsc-data.h
57
include/zxid/zx-wsp-data.h
75
include/zxid/zx-wsp-data.h
58
include/zxid/zx-wsse-data.h
76
include/zxid/zx-wsse-data.h
Lines 61-78 Link Here
61
include/zxid/zx-xa-data.h
79
include/zxid/zx-xa-data.h
62
include/zxid/zx-xac-data.h
80
include/zxid/zx-xac-data.h
63
include/zxid/zx-xasa-data.h
81
include/zxid/zx-xasa-data.h
82
include/zxid/zx-xasacd1-data.h
64
include/zxid/zx-xasp-data.h
83
include/zxid/zx-xasp-data.h
84
include/zxid/zx-xaspcd1-data.h
65
include/zxid/zx-xenc-data.h
85
include/zxid/zx-xenc-data.h
66
include/zxid/zx-xml-data.h
86
include/zxid/zx-xml-data.h
67
include/zxid/zx-xs-data.h
87
include/zxid/zx-xs-data.h
68
include/zxid/zx-xsi-data.h
88
include/zxid/zx-xsi-data.h
69
include/zxid/zx.h
89
include/zxid/zx.h
90
include/zxid/zx_ext_pt.h
70
include/zxid/zxid.h
91
include/zxid/zxid.h
71
include/zxid/zxidconf.h
92
include/zxid/zxidconf.h
72
include/zxid/zxidnoswig.h
93
include/zxid/zxidnoswig.h
94
include/zxid/zxidpriv.h
95
include/zxid/zxidutil.h
73
include/zxid/zxidvers.h
96
include/zxid/zxidvers.h
74
include/zxid/zxwsc.h
97
include/zxid/zxwsc.h
75
lib/libzxid.a
98
lib/libzxid.a
76
lib/libzxid.so
99
lib/libzxid.so
77
lib/libzxid.so.0
100
lib/libzxid.so.0
78
@dirrmtry include/zxid
101
%%PORTDOCS%%%%DOCSDIR%%/apache.pd
102
%%PORTDOCS%%%%DOCSDIR%%/doc-end.pd
103
%%PORTDOCS%%%%DOCSDIR%%/doc-inc.pd
104
%%PORTDOCS%%%%DOCSDIR%%/mediawiki-zxid.pd
105
%%PORTDOCS%%%%DOCSDIR%%/mod_auth_saml.pd
106
%%PORTDOCS%%%%DOCSDIR%%/ref-inc.pd
107
%%PORTDOCS%%%%DOCSDIR%%/schemata.pd
108
%%PORTDOCS%%%%DOCSDIR%%/testplan.pd
109
%%PORTDOCS%%%%DOCSDIR%%/zxid-book.pd
110
%%PORTDOCS%%%%DOCSDIR%%/zxid-compile.pd
111
%%PORTDOCS%%%%DOCSDIR%%/zxid-conf.pd
112
%%PORTDOCS%%%%DOCSDIR%%/zxid-cot.pd
113
%%PORTDOCS%%%%DOCSDIR%%/zxid-faq.pd
114
%%PORTDOCS%%%%DOCSDIR%%/zxid-idp.pd
115
%%PORTDOCS%%%%DOCSDIR%%/zxid-install.pd
116
%%PORTDOCS%%%%DOCSDIR%%/zxid-java.pd
117
%%PORTDOCS%%%%DOCSDIR%%/zxid-license.pd
118
%%PORTDOCS%%%%DOCSDIR%%/zxid-log.pd
119
%%PORTDOCS%%%%DOCSDIR%%/zxid-perl.pd
120
%%PORTDOCS%%%%DOCSDIR%%/zxid-php.pd
121
%%PORTDOCS%%%%DOCSDIR%%/zxid-raw.pd
122
%%PORTDOCS%%%%DOCSDIR%%/zxid-ref.pd
123
%%PORTDOCS%%%%DOCSDIR%%/zxid-simple.pd
124
%%PORTDOCS%%%%DOCSDIR%%/zxid-tas3.pd
125
%%PORTDOCS%%%%DOCSDIR%%/zxid-wsf.pd
126
%%PORTDOCS%%@dirrm %%DOCSDIR%%
127
@dirrm include/zxid
(-)files/patch-Makefile (-28 / +43 lines)
Lines 1-22 Link Here
1
--- Makefile.orig	2009-10-16 19:37:47.000000000 +0400
1
--- Makefile.orig	2011-07-25 03:56:45.000000000 +0800
2
+++ Makefile	2009-10-30 00:02:20.000000000 +0300
2
+++ Makefile	2011-12-29 17:35:47.379562021 +0800
3
@@ -31,13 +31,13 @@
3
@@ -36,7 +36,7 @@
4
 
4
 
5
 default: seehelp precheck zxid zxidhlo zxididp zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp zxdecode zxcot
5
 default: seehelp precheck zxid zxidhlo zxididp zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp zxdecode zxcot zxpasswd zxcall zxencdectest
6
 
6
 
7
-all: seehelp precheck precheck_apache zxid zxidhlo zxididp zxidsimple zxlogview samlmod phpzxid javazxid apachezxid zxdecode zxcot smime
7
-all: default precheck_apache samlmod phpzxid javazxid apachezxid smime zxidwspcgi
8
+all: seehelp precheck zxid zxidhlo zxididp zxidsimple zxlogview zxdecode zxcot smime
8
+all: default smime
9
 
9
 
10
 ZXIDREL=0.38
10
 ### This is the authorative spot to set version number. Document in Changes file.
11
 ZXIDVERSION=0x000038
11
 ### c/zxidvers.h is generated from these, see `make updatevers'
12
@@ -44,7 +44,7 @@
13
 ZXIDREL=1.02
12
 
14
 
13
 ### Where package is installed (use `make PREFIX=/your/path' to change)
15
 ### Where package is installed (use `make PREFIX=/your/path' to change)
14
-PREFIX=/usr/local/zxid/$(ZXIDREL)
16
-PREFIX=/var/zxid/$(ZXIDREL)
15
+PREFIX?=/usr/local/zxid/$(ZXIDREL)
17
+PREFIX?=/var/zxid/$(ZXIDREL)
16
 
18
 
17
 ### Where runtime configuration and temporary data is kept.
19
 ### Where runtime configuration and temporary data is kept.
18
 ### If you change the following, be sure to edit zxidconf.h as
20
 ### If you change the following, be sure to edit zxidconf.h as
19
@@ -64,8 +64,8 @@
21
@@ -72,8 +72,8 @@
20
 ###
22
 ###
21
 
23
 
22
 TOP=$(shell pwd)
24
 TOP=$(shell pwd)
Lines 27-58 Link Here
27
 PHP_CONFIG=php-config
29
 PHP_CONFIG=php-config
28
 CSHARP_CONFIG=true
30
 CSHARP_CONFIG=true
29
 PY_CONFIG=true
31
 PY_CONFIG=true
30
@@ -82,11 +82,11 @@
32
@@ -90,14 +90,14 @@
31
 SWIG=swig
33
 SWIG=swig
32
 AR=ar -crs
34
 AR=ar -crs
33
 ARX=ar -x
35
 ARX=ar -x
34
-CC=gcc
36
-CC=gcc
35
-LD=gcc
37
-LD=gcc
38
+CC?=gcc
39
+LD?=gcc
40
 GCOV=gcov
41
 LCOV=lcov
42
 GENHTML=genhtml
36
-SHARED_FLAGS=-shared --export-all-symbols -Wl,-whole-archive -Wl,--allow-multiple-definition
43
-SHARED_FLAGS=-shared --export-all-symbols -Wl,-whole-archive -Wl,--allow-multiple-definition
37
-SHARED_CLOSE=-Wl,-no-whole-archive
44
-SHARED_CLOSE=-Wl,-no-whole-archive
38
-CFLAGS=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing
45
-CFLAGS=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing
39
+CC?=gcc
46
+SHARED_FLAGS?=-shared --export-all-symbols -Wl,-whole-archive -Wl,--allow-multiple-definition
40
+LD?=gcc
47
+SHARED_CLOSE?=-Wl,-no-whole-archive
41
+SHARED_FLAGS+=-shared --export-all-symbols -Wl,-whole-archive -Wl,--allow-multiple-definition
48
+CFLAGS?=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing
42
+SHARED_CLOSE+=-Wl,-no-whole-archive
43
+CFLAGS+=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing
44
 #CFLAGS += -Os    # gcc-3.4.6 miscompiles with -Os on ix86
49
 #CFLAGS += -Os    # gcc-3.4.6 miscompiles with -Os on ix86
45
 CFLAGS += -Wall -Wno-parentheses -DMAYBE_UNUSED='__attribute__ ((unused))'
50
 CFLAGS += -Wall -Wno-parentheses -DMAYBE_UNUSED='__attribute__ ((unused))'
46
 CFLAGS += -ffunction-sections -fdata-sections
51
 #LDFLAGS += -Wl,--gc-sections
47
@@ -1090,11 +1090,6 @@
52
@@ -1318,7 +1318,7 @@
53
 endif
54
 
55
 libzxid.so.0.0: $(LIBZXID_A)
56
-	$(LD) $(OUTOPT)libzxid.so.0.0 $(SHARED_FLAGS) $^ $(SHARED_CLOSE) -lcurl -lssl -lcrypt
57
+	$(LD) $(OUTOPT)libzxid.so.0.0 $(SHARED_FLAGS) $^ $(SHARED_CLOSE) $(LIBS) -lcurl -lssl -lcrypt
58
 
59
 zxid.dll zxidimp.lib: $(LIBZXID_A)
60
 	$(LD) $(OUTOPT)zxid.dll $(SHARED_FLAGS) -Wl,--output-def,zxid.def,--out-implib,zxidimp.lib $^ $(SHARED_CLOSE) $(WIN_LIBS) -mdll
61
@@ -1604,12 +1604,6 @@
48
 
62
 
49
 install: zxid libzxid.a libzxid.so.0.0 dir
63
 install: zxid $(LIBZXID_A) libzxid.so.0.0 dir
50
 	@$(ECHO) "===== Installing in $(PREFIX) (to change do make install PREFIX=/your/path)"
64
 	@$(ECHO) "===== Installing in $(PREFIX) (to change do make install PREFIX=/your/path)"
51
-	-mkdir -p $(PREFIX) $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/zxid
65
-	-mkdir -p $(PREFIX) $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/zxid $(PREFIX)/doc
52
-	cp zxidhlo zxididp $(PREFIX)/bin
66
-	$(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
53
-	cp libzxid.a libzxid.so* $(PREFIX)/lib
67
-	$(CP) $(LIBZXID_A) libzxid.so* $(PREFIX)/lib
54
-	cp libzxid.so.0.0 $(PREFIX)/lib
68
-	$(CP) libzxid.so.0.0 $(PREFIX)/lib
55
-	cp *.h c/*.h $(PREFIX)/include/zxid
69
-	$(CP) *.h c/*.h $(PREFIX)/include/zxid
70
-	$(CP) *.pd *.dia $(PREFIX)/doc
56
 	@$(ECHO) "You will need to copy zxidhlo binary where your web server can find it and"
71
 	@$(ECHO) "You will need to copy zxidhlo binary where your web server can find it and"
57
 	@$(ECHO) "make sure your web server is configured to recognize zxidhlo as a CGI script."
72
 	@$(ECHO) "make sure your web server is configured to recognize zxidhlo as a CGI script."
58
 	@$(ECHO)
73
 	@$(ECHO)
(-)files/patch-smime.c (-2 / +2 lines)
Lines 1-5 Link Here
1
--- smime.c.orig	2009-10-16 19:37:47.000000000 +0400
1
--- smime.c.orig	2011-07-01 22:26:07.000000000 +0800
2
+++ smime.c	2009-10-29 23:46:33.000000000 +0300
2
+++ smime.c	2011-07-13 10:41:01.570539385 +0800
3
@@ -94,9 +94,6 @@
3
@@ -94,9 +94,6 @@
4
 #include <stdio.h>
4
 #include <stdio.h>
5
 #include <string.h>
5
 #include <string.h>
(-)files/patch-zx.h (+10 lines)
Added Link Here
1
--- zx.h.orig	2011-07-25 03:56:45.000000000 +0800
2
+++ zx.h	2011-12-29 17:00:27.394555276 +0800
3
@@ -25,6 +25,7 @@
4
 #include <memory.h>
5
 #include <string.h>
6
 #include <stdarg.h>
7
+#include <limits.h>
8
 
9
 #ifdef USE_OPENSSL
10
 #include <openssl/x509.h>

Return to bug 163738