From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 31 19:40:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52681106566C for ; Sat, 31 Oct 2009 19:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2664E8FC1B for ; Sat, 31 Oct 2009 19:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n9VJe1ru015750 for ; Sat, 31 Oct 2009 19:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9VJe1Op015749; Sat, 31 Oct 2009 19:40:01 GMT (envelope-from gnats) Resent-Date: Sat, 31 Oct 2009 19:40:01 GMT Resent-Message-Id: <200910311940.n9VJe1Op015749@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Denis Shaposhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE0961065679 for ; Sat, 31 Oct 2009 19:37:55 +0000 (UTC) (envelope-from dsh@wizard.volgograd.ru) Received: from dsh.falconknight.com (dsh.falconknight.com [66.160.163.23]) by mx1.freebsd.org (Postfix) with ESMTP id A9DD68FC08 for ; Sat, 31 Oct 2009 19:37:55 +0000 (UTC) Received: from localhost (dsh [66.160.163.23]) by dsh.falconknight.com (Postfix) with ESMTP id 281A1B6351F; Sat, 31 Oct 2009 12:37:55 -0700 (PDT) Received: from dsh.falconknight.com ([66.160.163.23]) by localhost (dsh.falconknight.com [66.160.163.23]) (amavisd-new, port 10026) with LMTP id Z-oTOKNi1Vn2; Sat, 31 Oct 2009 12:37:52 -0700 (PDT) Received: from localhost.my.domain (unknown [85.173.92.192]) by dsh.falconknight.com (Postfix) with ESMTPS id 55E47B6346C; Sat, 31 Oct 2009 12:37:50 -0700 (PDT) Received: from localhost.my.domain (localhost [127.0.0.1]) by localhost.my.domain (8.14.3/8.14.3) with ESMTP id n9VJbjku088794; Sat, 31 Oct 2009 22:37:45 +0300 (MSK) (envelope-from dsh@localhost.my.domain) Received: (from dsh@localhost) by localhost.my.domain (8.14.3/8.14.3/Submit) id n9VJbisj088791; Sat, 31 Oct 2009 22:37:44 +0300 (MSK) (envelope-from dsh) Message-Id: <200910311937.n9VJbisj088791@localhost.my.domain> Date: Sat, 31 Oct 2009 22:37:44 +0300 (MSK) From: Denis Shaposhnikov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: clsung@FreeBSD.org Subject: ports/140148: [PATCH] security/zxid: update to 0.38 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Oct 2009 19:40:02 -0000 >Number: 140148 >Category: ports >Synopsis: [PATCH] security/zxid: update to 0.38 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Oct 31 19:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Denis Shaposhnikov >Release: FreeBSD 8.0-RC2 i386 >Organization: >Environment: System: FreeBSD localhost.my.domain 8.0-RC2 FreeBSD 8.0-RC2 #8: Sat Oct 31 21:27:14 MSK 2009 >Description: - Update to 0.38 Added file(s): - files/patch-smime.c Removed file(s): - files/patch-zxlib.c Port maintainer (clsung@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- zxid-0.38.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/zxid/Makefile /home/dsh/ports/security/zxid/Makefile --- /usr/ports/security/zxid/Makefile 2009-01-23 18:43:08.000000000 +0300 +++ /home/dsh/ports/security/zxid/Makefile 2009-10-30 18:03:56.000000000 +0300 @@ -6,8 +6,7 @@ # PORTNAME= zxid -PORTVERSION= 0.25 -PORTREVISION= 1 +PORTVERSION= 0.38 CATEGORIES= security www MASTER_SITES= http://zxid.org/ EXTRACT_SUFX= .tgz @@ -24,7 +23,17 @@ USE_OPENSSL= yes post-install: - ${LN} -s libzxid.so.0.0 ${PREFIX}/lib/libzxid.so.0 + + ${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 diff -ruN --exclude=CVS /usr/ports/security/zxid/distinfo /home/dsh/ports/security/zxid/distinfo --- /usr/ports/security/zxid/distinfo 2008-04-18 11:58:32.000000000 +0400 +++ /home/dsh/ports/security/zxid/distinfo 2009-10-29 23:31:27.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (zxid-0.25.tgz) = 118a0873632dc1186a37702586c4119c -SHA256 (zxid-0.25.tgz) = feb68f1d646f6b792834c7d99eb9d8b9a20cb90af81f15037d0f5343b6c1b906 -SIZE (zxid-0.25.tgz) = 2803264 +MD5 (zxid-0.38.tgz) = 986cb023e321d52d7522e24d27979830 +SHA256 (zxid-0.38.tgz) = b6883fb5771b2d16591ab4e624fa78ceaceec45bc608b8c348947773bb2a6b91 +SIZE (zxid-0.38.tgz) = 3091109 diff -ruN --exclude=CVS /usr/ports/security/zxid/files/patch-Makefile /home/dsh/ports/security/zxid/files/patch-Makefile --- /usr/ports/security/zxid/files/patch-Makefile 2008-04-18 11:58:33.000000000 +0400 +++ /home/dsh/ports/security/zxid/files/patch-Makefile 2009-10-30 00:02:28.000000000 +0300 @@ -1,22 +1,22 @@ ---- Makefile.orig 2008-04-17 09:47:50.000000000 +0800 -+++ Makefile 2008-04-18 15:30:13.000000000 +0800 -@@ -26,13 +26,13 @@ +--- 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 zxid zxidsp zxidhlo zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp + default: seehelp precheck zxid zxidhlo zxididp zxidhlowsf zxidsimple zxidwsctool zxlogview zxidhrxmlwsc zxidhrxmlwsp zxdecode zxcot --all: seehelp zxid zxidsp zxidhlo zxidsimple zxlogview samlmod phpzxid javazxid apachezxid -+all: seehelp zxid zxidsp zxidhlo zxidsimple zxlogview +-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.25 - ZXIDVERSION=0x000025 + 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 well. N.B. Trailing / is needed. -@@ -60,8 +60,8 @@ + ### If you change the following, be sure to edit zxidconf.h as +@@ -64,8 +64,8 @@ ### TOP=$(shell pwd) @@ -25,9 +25,9 @@ +CURL_ROOT?=/usr/local +OPENSSL_ROOT?=/usr/local/ssl PHP_CONFIG=php-config - APACHE_ROOT=/usr/local/httpd - -@@ -75,11 +75,11 @@ + CSHARP_CONFIG=true + PY_CONFIG=true +@@ -82,11 +82,11 @@ SWIG=swig AR=ar -crs ARX=ar -x @@ -43,22 +43,16 @@ +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))' - -@@ -112,7 +112,7 @@ - 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) + CFLAGS += -ffunction-sections -fdata-sections +@@ -1090,11 +1090,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 + @$(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) diff -ruN --exclude=CVS /usr/ports/security/zxid/files/patch-smime.c /home/dsh/ports/security/zxid/files/patch-smime.c --- /usr/ports/security/zxid/files/patch-smime.c 1970-01-01 03:00:00.000000000 +0300 +++ /home/dsh/ports/security/zxid/files/patch-smime.c 2009-10-30 17:55:16.000000000 +0300 @@ -0,0 +1,12 @@ +--- 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 + #include + #include +-#ifndef macintosh +-# include +-#endif + + #define DETACHED_SIG_TYPE_FILE "application/x-detached-file-signature-file" + diff -ruN --exclude=CVS /usr/ports/security/zxid/files/patch-zxlib.c /home/dsh/ports/security/zxid/files/patch-zxlib.c --- /usr/ports/security/zxid/files/patch-zxlib.c 2007-07-09 06:24:04.000000000 +0400 +++ /home/dsh/ports/security/zxid/files/patch-zxlib.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,10 +0,0 @@ ---- zxlib.c.orig Fri Jul 6 06:46:05 2007 -+++ zxlib.c Fri Jul 6 06:46:17 2007 -@@ -15,7 +15,6 @@ - - //#include - #ifndef MACOSX --#include - #endif - #include - #include diff -ruN --exclude=CVS /usr/ports/security/zxid/pkg-plist /home/dsh/ports/security/zxid/pkg-plist --- /usr/ports/security/zxid/pkg-plist 2007-10-24 04:49:31.000000000 +0400 +++ /home/dsh/ports/security/zxid/pkg-plist 2009-10-30 18:02:23.000000000 +0300 @@ -1,7 +1,12 @@ @comment $FreeBSD: ports/security/zxid/pkg-plist,v 1.3 2007/10/24 00:49:31 clsung Exp $ -bin/zxid +bin/zxidhlo +bin/zxididp 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/wsf.h include/zxid/zx-a-data.h include/zxid/zx-ac-data.h @@ -68,6 +73,6 @@ include/zxid/zxidvers.h include/zxid/zxwsc.h lib/libzxid.a +lib/libzxid.so lib/libzxid.so.0 -lib/libzxid.so.0.0 @dirrmtry include/zxid --- zxid-0.38.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: