From lx@redundancy.redundancy.org  Wed Mar 17 11:20:33 2004
Return-Path: <lx@redundancy.redundancy.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8F8F316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Mar 2004 11:20:33 -0800 (PST)
Received: from redundancy.redundancy.org (redundancy.redundancy.org [198.144.201.242])
	by mx1.FreeBSD.org (Postfix) with SMTP id 6058A43D3F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Mar 2004 11:20:33 -0800 (PST)
	(envelope-from lx@redundancy.redundancy.org)
Received: (qmail 34200 invoked by uid 1000); 17 Mar 2004 19:20:50 -0000
Message-Id: <20040317192050.34199.qmail@redundancy.redundancy.org>
Date: 17 Mar 2004 19:20:50 -0000
From: David Thiel <lx@redundancy.redundancy.org>
Reply-To: David Thiel <lx@redundancy.redundancy.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update: sysutils/ucspi-ssl 0.50 -> 0.65
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64386
>Category:       ports
>Synopsis:       update: sysutils/ucspi-ssl 0.50 -> 0.65
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 17 11:30:14 PST 2004
>Closed-Date:    Sat Apr 10 07:19:01 PDT 2004
>Last-Modified:  Sat Apr 10 07:19:01 PDT 2004
>Originator:     David Thiel
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD redundancy.redundancy.org 4.9-STABLE FreeBSD 4.9-STABLE #15: Wed Nov 19 21:41:32 PST 2003 lx@redundancy.redundancy.org:/usr/obj/usr/src/sys/REDUNDANCY i386


>Description:

Updating ucspi-ssl from 0.50 to 0.65. This release adds the sslperl
program, a wrapper for serving perl programs over ssl, and also includes
patches to set various TCP environment variables(e.g. TCPREMOTEIP) that
some programs require, notably vpopmail. Updated build/install process to 
handle new slashpackage format.

>How-To-Repeat:
>Fix:

diff -ruN ucspi-ssl/Makefile ucspi-ssl.new/Makefile
--- ucspi-ssl/Makefile	Mon Sep 29 16:56:08 2003
+++ ucspi-ssl.new/Makefile	Wed Mar 17 10:49:06 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ucspi-ssl
-PORTVERSION=	0.50
+PORTVERSION=	0.65
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.superscript.com/ucspi-ssl/
 
@@ -17,21 +17,29 @@
 
 NO_PACKAGE=     "Non-explicit licensing terms"
 
-ALL_TARGET=	it
-INSTALL_TARGET=	setup check
+DOCS=		CHANGES TODO UCSPI-SSL
 
-DOCS=		CHANGES README TODO UCSPI-SSL
+WRKSRC=		${WRKDIR}/host/superscript.com/net/${DISTNAME}
 
 do-configure:
-	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
-	${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-tcpbin
-	${ECHO_CMD} "${PREFIX}/ssl/certs" > ${WRKSRC}/conf-cadir
-
-post-install:
+	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
+	${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/src/conf-home
+	${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/src/conf-tcpbin
+	${ECHO_CMD} "${PREFIX}/ssl/certs" > ${WRKSRC}/src/conf-cadir
+
+do-build:
+	cd ${WRKSRC} && package/compile
+
+do-install:
+.for x in https@ sslcat sslconnect
+	${INSTALL_SCRIPT} ${WRKSRC}/command/${x} ${PREFIX}/bin
+.endfor
+.for x in sslclient sslperl sslserver
+	${INSTALL_PROGRAM} ${WRKSRC}/command/${x} ${PREFIX}/bin
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC}/src && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN ucspi-ssl/distinfo ucspi-ssl.new/distinfo
--- ucspi-ssl/distinfo	Mon Sep 29 16:56:08 2003
+++ ucspi-ssl.new/distinfo	Wed Mar 17 10:38:50 2004
@@ -1 +1 @@
-MD5 (ucspi-ssl-0.50.tar.gz) = f8c0122aca1cafc5ef8d23ffdf466ccd
+MD5 (ucspi-ssl-0.65.tar.gz) = 5af44ab11d694e2e1d40886ee46f5545
diff -ruN ucspi-ssl/pkg-plist ucspi-ssl.new/pkg-plist
--- ucspi-ssl/pkg-plist	Mon Sep 29 16:56:08 2003
+++ ucspi-ssl.new/pkg-plist	Wed Mar 17 10:38:50 2004
@@ -3,8 +3,8 @@
 bin/sslclient
 bin/sslconnect
 bin/sslserver
+bin/sslperl
 share/doc/ucspi-ssl/CHANGES
-share/doc/ucspi-ssl/README
 share/doc/ucspi-ssl/TODO
 share/doc/ucspi-ssl/UCSPI-SSL
 @dirrm share/doc/ucspi-ssl
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback  
State-Changed-By: krion 
State-Changed-When: Wed Mar 17 12:01:28 PST 2004 
State-Changed-Why:  
It doesn't build on 4-x: 
sslperl.o: In function `server': 
sslperl.o(.text+0x31e): undefined reference to `eval_pv' 


http://www.freebsd.org/cgi/query-pr.cgi?pr=64386 

From: David Thiel <lx@redundancy.redundancy.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/64386: update: sysutils/ucspi-ssl 0.50 -> 0.65
Date: Wed, 17 Mar 2004 15:43:43 -0800

 On Wed, Mar 17, 2004 at 12:01:33PM -0800, Kirill Ponomarew wrote:
 > It doesn't build on 4-x:
 > sslperl.o: In function `server':
 > sslperl.o(.text+0x31e): undefined reference to `eval_pv'
 
 My apologies for not testing it on -stable. It would seem eval_pv wasn't
 included in the perl API until 5.6. I've added a WITHOUT_SSLPERL knob,
 and a PERL_LEVEL check, and I've verified that either installing the perl5
 port or building with WITHOUT_SSLPERL will solve the problem. While I was
 at it, I changed the packing list to use PORTDOCS properly. Since there
 were many changes, I'm resubmitting the whole diff. Thanks for pointing 
 this problem out, any other feedback is welcome.
 
 
 diff -ruN ucspi-ssl/Makefile ucspi-ssl.new/Makefile
 --- ucspi-ssl/Makefile	Mon Sep 29 16:56:30 2003
 +++ ucspi-ssl.new/Makefile	Wed Mar 17 13:14:56 2004
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	ucspi-ssl
 -PORTVERSION=	0.50
 +PORTVERSION=	0.65
  CATEGORIES=	sysutils
  MASTER_SITES=	http://www.superscript.com/ucspi-ssl/
  
 @@ -17,21 +17,46 @@
  
  NO_PACKAGE=     "Non-explicit licensing terms"
  
 -ALL_TARGET=	it
 -INSTALL_TARGET=	setup check
 +DOCS=		CHANGES TODO UCSPI-SSL
  
 -DOCS=		CHANGES README TODO UCSPI-SSL
 +WRKSRC=		${WRKDIR}/host/superscript.com/net/${DISTNAME}
  
  do-configure:
 -	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 -	${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
 -	${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-tcpbin
 -	${ECHO_CMD} "${PREFIX}/ssl/certs" > ${WRKSRC}/conf-cadir
 +	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
 +	${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/src/conf-home
 +	${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/src/conf-tcpbin
 +	${ECHO_CMD} "${PREFIX}/ssl/certs" > ${WRKSRC}/src/conf-cadir
 +
 +.include <bsd.port.pre.mk>
 +
 +.if !defined(WITHOUT_SSLPERL)
 +.if ${PERL_LEVEL} < 500600
 +IGNORE= "requires Perl 5.6.0 or greater. Please Install lang/perl5 and retry, or define WITHOUT_SSLPERL"
 +.endif
 +.else
 +PLIST_SUB+=	SSLPERL="@comment "
 +.endif
 +
 +do-build:
 +.if defined(WITHOUT_SSLPERL)
 +	cd ${WRKSRC} && package/compile https@ sslcat sslconnect sslclient sslserver
 +.else
 +	cd ${WRKSRC} && package/compile
 +.endif
  
 -post-install:
 +do-install:
 +.for x in https@ sslcat sslconnect
 +	${INSTALL_SCRIPT} ${WRKSRC}/command/${x} ${PREFIX}/bin
 +.endfor
 +.for x in sslclient sslserver
 +	${INSTALL_PROGRAM} ${WRKSRC}/command/${x} ${PREFIX}/bin
 +.endfor
 +.if !defined(WITHOUT_SSLPERL)
 +	${INSTALL_PROGRAM} ${WRKSRC}/command/sslperl ${PREFIX}/bin
 +.endif
  .if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
 -	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 +	cd ${WRKSRC}/src && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
  .endif
 -
 -.include <bsd.port.mk>
 +                
 +.include <bsd.port.post.mk>
 diff -ruN ucspi-ssl/distinfo ucspi-ssl.new/distinfo
 --- ucspi-ssl/distinfo	Mon Sep 29 16:56:30 2003
 +++ ucspi-ssl.new/distinfo	Wed Mar 17 12:06:14 2004
 @@ -1 +1 @@
 -MD5 (ucspi-ssl-0.50.tar.gz) = f8c0122aca1cafc5ef8d23ffdf466ccd
 +MD5 (ucspi-ssl-0.65.tar.gz) = 5af44ab11d694e2e1d40886ee46f5545
 diff -ruN ucspi-ssl/pkg-plist ucspi-ssl.new/pkg-plist
 --- ucspi-ssl/pkg-plist	Mon Sep 29 16:56:30 2003
 +++ ucspi-ssl.new/pkg-plist	Wed Mar 17 13:09:27 2004
 @@ -3,8 +3,8 @@
  bin/sslclient
  bin/sslconnect
  bin/sslserver
 -share/doc/ucspi-ssl/CHANGES
 -share/doc/ucspi-ssl/README
 -share/doc/ucspi-ssl/TODO
 -share/doc/ucspi-ssl/UCSPI-SSL
 -@dirrm share/doc/ucspi-ssl
 +%%SSLPERL%%bin/sslperl
 +%%PORTDOCS%%%%DOCSDIR%%/CHANGES
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%PORTDOCS%%%%DOCSDIR%%/UCSPI-SSL
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Sat Apr 10 07:18:40 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

I updated it to 0.67 because 0.65 is no longer available 
for download. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64386 
>Unformatted:
