Attachment #100801 for bug #140148

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




#

PORTNAME=	zxid
PORTVERSION=	0.38
PORTREVISION=	1
CATEGORIES=	security www
MASTER_SITES=	http://zxid.org/
EXTRACT_SUFX=	.tgz

USE_OPENSSL=	yes

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
	${LN} -sf libzxid.so.0 ${PREFIX}/lib/libzxid.so

	(cd ${WRKSRC} && ${INSTALL_DATA} *.h c/*.h ${PREFIX}/include/zxid/)

.include <bsd.port.pre.mk>


Lines 1-3 Link Here

(-)/home/dsh/ports/security/zxid/distinfo (-3 / +3 lines)
1	MD5 (zxid-0.25.tgz) = 118a0873632dc1186a37702586c4119c	1	MD5 (zxid-0.38.tgz) = 986cb023e321d52d7522e24d27979830
2	SHA256 (zxid-0.25.tgz) = feb68f1d646f6b792834c7d99eb9d8b9a20cb90af81f15037d0f5343b6c1b906	2	SHA256 (zxid-0.38.tgz) = b6883fb5771b2d16591ab4e624fa78ceaceec45bc608b8c348947773bb2a6b91
3	SIZE (zxid-0.25.tgz) = 2803264	3	SIZE (zxid-0.38.tgz) = 3091109




--- Makefile.orig	2009-10-16 19:37:47.000000000 +0400
+++ Makefile	2009-10-30 00:02:20.000000000 +0300
@@ -31,13 +31,13 @@
 
 default: seehelp precheck zxid zxidhlo zxididp zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp zxdecode zxcot
 
-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
 
 ZXIDREL=0.38
 ZXIDVERSION=0x000038
 
 ### Where package is installed (use `make PREFIX=/your/path' to change)
-PREFIX=/usr/local/zxid/$(ZXIDREL)
+PREFIX?=/usr/local/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 @@
 ###
 
 TOP=$(shell pwd)

+CURL_ROOT?=/usr/local
+OPENSSL_ROOT?=/usr/local/ssl
 PHP_CONFIG=php-config
 CSHARP_CONFIG=true
 PY_CONFIG=true
@@ -82,11 +82,11 @@
 SWIG=swig
 AR=ar -crs
 ARX=ar -x

+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 @@
 CDEF+= -DUSE_CURL
 # Without OpenSSL signing and signature verification are not possible
 CDEF+= -DUSE_OPENSSL
-LIBS=-lpthread -L$(CURL_ROOT)/lib -L$(OPENSSL_ROOT)/lib -lcrypto -ldl -lcurl -lz
+LIBS=-lpthread -L$(CURL_ROOT)/lib -L$(OPENSSL_ROOT)/lib -lcrypto -lcurl -lz
 
 # Following ld flags as well as C flag -ffunction-sections are a quest to
 # eliminate unused functions from final link.
@@ -848,7 +848,7 @@
 	@$(ECHO)
 	@$(ECHO) "to make sure the zxid CGI script can write to the $(ZXID_PATH)"
 	@$(ECHO) "directory (substitute nobody with the user your web server runs as)."
-	@$(ECHO)/
+	@$(ECHO)
 
 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
 	@$(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)




--- smime.c.orig	2009-10-16 19:37:47.000000000 +0400
+++ smime.c	2009-10-29 23:46:33.000000000 +0300
@@ -94,9 +94,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#ifndef macintosh
-# include <malloc.h>
-#endif
 
 #define DETACHED_SIG_TYPE_FILE  "application/x-detached-file-signature-file"
 

Lines 1-10 Link Here

(-)/home/dsh/ports/security/zxid/files/patch-zxlib.c (-10 lines)
1	--- zxlib.c.orig Fri Jul 6 06:46:05 2007
2	+++ zxlib.c Fri Jul 6 06:46:17 2007
3	@@ -15,7 +15,6 @@
4
5	//#include <pthread.h>
6	#ifndef MACOSX
7	-#include <malloc.h>
8	#endif
9	#include <memory.h>
10	#include <string.h>

Lines 1-7 Link Here

(-)/home/dsh/ports/security/zxid/pkg-plist (-2 / +7 lines)
1	@comment $FreeBSD: ports/security/zxid/pkg-plist,v 1.3 2007/10/24 00:49:31 clsung Exp $	1	@comment $FreeBSD: ports/security/zxid/pkg-plist,v 1.3 2007/10/24 00:49:31 clsung Exp $
2	bin/zxid	2	bin/zxidhlo
		3	bin/zxididp
3	include/zxid/errmac.h	4	include/zxid/errmac.h
		5	include/zxid/logprint.h
		6	include/zxid/macglue.h
		7	include/zxid/platform.h
4	include/zxid/saml2.h	8	include/zxid/saml2.h
		9	include/zxid/smimeutil.h
5	include/zxid/wsf.h	10	include/zxid/wsf.h
6	include/zxid/zx-a-data.h	11	include/zxid/zx-a-data.h
7	include/zxid/zx-ac-data.h	12	include/zxid/zx-ac-data.h
Lines 68-73 Link Here
68	include/zxid/zxidvers.h	73	include/zxid/zxidvers.h
69	include/zxid/zxwsc.h	74	include/zxid/zxwsc.h
70	lib/libzxid.a	75	lib/libzxid.a
		76	lib/libzxid.so
71	lib/libzxid.so.0	77	lib/libzxid.so.0
72	lib/libzxid.so.0.0
73	@dirrmtry include/zxid	78	@dirrmtry include/zxid

Return to bug 140148

Lines 6-13 Link Here

(-)/home/dsh/ports/security/zxid/Makefile (-3 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= zxid	8	PORTNAME= zxid
9	PORTVERSION= 0.25	9	PORTVERSION= 0.38
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 24-30 Link Here
24	USE_OPENSSL= yes	23	USE_OPENSSL= yes
25		24
26	post-install:	25	post-install:
27	${LN} -s libzxid.so.0.0 ${PREFIX}/lib/libzxid.so.0	26
		27	${MKDIR} ${PREFIX}/include/zxid
		28
		29	${INSTALL_PROGRAM} ${WRKSRC}/zxidhlo ${PREFIX}/bin/
		30	${INSTALL_PROGRAM} ${WRKSRC}/zxididp ${PREFIX}/bin/
		31
		32	${INSTALL_PROGRAM} ${WRKSRC}/libzxid.a ${PREFIX}/lib/
		33	${INSTALL_PROGRAM} ${WRKSRC}/libzxid.so.0.0 ${PREFIX}/lib/libzxid.so.0
		34	${LN} -sf libzxid.so.0 ${PREFIX}/lib/libzxid.so
		35
		36	(cd ${WRKSRC} && ${INSTALL_DATA} .h c/.h ${PREFIX}/include/zxid/)
28		37
29	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
30		39

Lines 1-22 Link Here

(-)/home/dsh/ports/security/zxid/files/patch-Makefile (-29 / +23 lines)
1	--- Makefile.orig 2008-04-17 09:47:50.000000000 +0800	1	--- Makefile.orig 2009-10-16 19:37:47.000000000 +0400
2	+++ Makefile 2008-04-18 15:30:13.000000000 +0800	2	+++ Makefile 2009-10-30 00:02:20.000000000 +0300
3	@@ -26,13 +26,13 @@	3	@@ -31,13 +31,13 @@
4		4
5	default: seehelp zxid zxidsp zxidhlo zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp	5	default: seehelp precheck zxid zxidhlo zxididp zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp zxdecode zxcot
6		6
7	-all: seehelp zxid zxidsp zxidhlo zxidsimple zxlogview samlmod phpzxid javazxid apachezxid	7	-all: seehelp precheck precheck_apache zxid zxidhlo zxididp zxidsimple zxlogview samlmod phpzxid javazxid apachezxid zxdecode zxcot smime
8	+all: seehelp zxid zxidsp zxidhlo zxidsimple zxlogview	8	+all: seehelp precheck zxid zxidhlo zxididp zxidsimple zxlogview zxdecode zxcot smime
9		9
10	ZXIDREL=0.25	10	ZXIDREL=0.38
11	ZXIDVERSION=0x000025	11	ZXIDVERSION=0x000038
12		12
13	### Where package is installed (use `make PREFIX=/your/path' to change)	13	### Where package is installed (use `make PREFIX=/your/path' to change)
14	-PREFIX=/usr/local/zxid/$(ZXIDREL)	14	-PREFIX=/usr/local/zxid/$(ZXIDREL)
15	+PREFIX?=/usr/local/zxid/$(ZXIDREL)	15	+PREFIX?=/usr/local/zxid/$(ZXIDREL)
16		16
17	### Where runtime configuration and temporary data is kept.	17	### Where runtime configuration and temporary data is kept.
18	### If you change the following, be sure to edit zxidconf.h as well. N.B. Trailing / is needed.	18	### If you change the following, be sure to edit zxidconf.h as
19	@@ -60,8 +60,8 @@	19	@@ -64,8 +64,8 @@
20	###	20	###
21		21
22	TOP=$(shell pwd)	22	TOP=$(shell pwd)
Lines 25-33 Link Here
25	+CURL_ROOT?=/usr/local	25	+CURL_ROOT?=/usr/local
26	+OPENSSL_ROOT?=/usr/local/ssl	26	+OPENSSL_ROOT?=/usr/local/ssl
27	PHP_CONFIG=php-config	27	PHP_CONFIG=php-config
28	APACHE_ROOT=/usr/local/httpd	28	CSHARP_CONFIG=true
29		29	PY_CONFIG=true
30	@@ -75,11 +75,11 @@	30	@@ -82,11 +82,11 @@
31	SWIG=swig	31	SWIG=swig
32	AR=ar -crs	32	AR=ar -crs
33	ARX=ar -x	33	ARX=ar -x
Lines 43-64 Link Here
43	+CFLAGS+=-g -fpic -fmessage-length=0 -Wno-unused-label -Wno-unknown-pragmas -fno-strict-aliasing	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	44	#CFLAGS += -Os # gcc-3.4.6 miscompiles with -Os on ix86
45	CFLAGS += -Wall -Wno-parentheses -DMAYBE_UNUSED='__attribute__ ((unused))'	45	CFLAGS += -Wall -Wno-parentheses -DMAYBE_UNUSED='__attribute__ ((unused))'
46		46	CFLAGS += -ffunction-sections -fdata-sections
47	@@ -112,7 +112,7 @@	47	@@ -1090,11 +1090,6 @@
48	CDEF+= -DUSE_CURL
49	# Without OpenSSL signing and signature verification are not possible
50	CDEF+= -DUSE_OPENSSL
51	-LIBS=-lpthread -L$(CURL_ROOT)/lib -L$(OPENSSL_ROOT)/lib -lcrypto -ldl -lcurl -lz
52	+LIBS=-lpthread -L$(CURL_ROOT)/lib -L$(OPENSSL_ROOT)/lib -lcrypto -lcurl -lz
53
54	# Following ld flags as well as C flag -ffunction-sections are a quest to
55	# eliminate unused functions from final link.
56	@@ -848,7 +848,7 @@
57	@$(ECHO)
58	@$(ECHO) "to make sure the zxid CGI script can write to the $(ZXID_PATH)"
59	@$(ECHO) "directory (substitute nobody with the user your web server runs as)."
60	- @$(ECHO)/
61	+ @$(ECHO)
62		48
63	install: zxid libzxid.a libzxid.so.0.0 dir	49	install: zxid libzxid.a libzxid.so.0.0 dir
64	@$(ECHO) "===== Installing in $(PREFIX) (to change do make install PREFIX=/your/path)"	50	@$(ECHO) "===== Installing in $(PREFIX) (to change do make install PREFIX=/your/path)"
		51	- -mkdir -p $(PREFIX) $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/zxid
		52	- cp zxidhlo zxididp $(PREFIX)/bin
		53	- cp libzxid.a libzxid.so* $(PREFIX)/lib
		54	- cp libzxid.so.0.0 $(PREFIX)/lib
		55	- cp .h c/.h $(PREFIX)/include/zxid
		56	@$(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."
		58	@$(ECHO)

Line 0 Link Here

(-)/home/dsh/ports/security/zxid/files/patch-smime.c (+12 lines)
	1	--- smime.c.orig 2009-10-16 19:37:47.000000000 +0400
	2	+++ smime.c 2009-10-29 23:46:33.000000000 +0300
	3	@@ -94,9 +94,6 @@
	4	#include <stdio.h>
	5	#include <string.h>
	6	#include <stdlib.h>
	7	-#ifndef macintosh
	8	-# include <malloc.h>
	9	-#endif
	10
	11	#define DETACHED_SIG_TYPE_FILE "application/x-detached-file-signature-file"
	12