>Number:         17906
>Category:       pkg
>Synopsis:       pkgsrc's openssl gets linked in preference to /usr's openssl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 10 11:05:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Wolfgang Rupprecht
>Release:        NetBSD 1.6E
>Organization:
W S Rupprecht Computer Consulting, Fremont CA
>Environment:
System: NetBSD capsicum.wsrcc.com 1.6E NetBSD 1.6E (WSRCC_ATHLON) #104: Sun Aug 4 23:56:25 PDT 2002 wolfgang@capsicum.wsrcc.com:/v/src/netbsd/src/sys/arch/i386/compile/WSRCC_ATHLON i386
Architecture: i386
Machine: i386
>Description:

	There are some version-number hacks in
	/usr/pkgsrc/security/openssl/buildlink.mk that need to be updated.

>How-To-Repeat:

	cd /usr/pkgsrc/print/ggv && make update
	notice that an old version of openssl is ftp-ed, installed,
	and linked to. 

>Fix:

This patch appears to do the trick, but perhaps a ">=" fix would solve
the problem of continually having to update this file.  Eg.

	if ${USE_OPENSSL_VERSION} >= ${OPENSSL_VERSION_096E}


--- buildlink.mk.~1.16.~	Sat Aug 10 04:00:52 2002
+++ buildlink.mk	Sat Aug 10 08:34:17 2002
@@ -24,6 +24,7 @@
 OPENSSL_VERSION_096B=		0x0090602fL
 OPENSSL_VERSION_096D=		0x0090604fL
 OPENSSL_VERSION_096E=		0x0090605fL
+OPENSSL_VERSION_096G=		0x0090607fL
 
 # Check for a usable installed version of OpenSSL. Version must be greater
 # than 0.9.6e, or else contain a fix for the 2002-07-30 security advisory.
@@ -84,6 +85,12 @@
 _VALID_SSL_VERSIONS=	${OPENSSL_VERSION_096E}
 . else
 _VALID_SSL_VERSIONS+=	${OPENSSL_VERSION_096E}
+. endif
+
+. if ${USE_OPENSSL_VERSION} == ${OPENSSL_VERSION_096G}	# OpenSSL 0.9.6g
+_VALID_SSL_VERSIONS=	${OPENSSL_VERSION_096G}
+. else
+_VALID_SSL_VERSIONS+=	${OPENSSL_VERSION_096G}
 . endif
 
 . for PATTERN in ${_VALID_SSL_VERSIONS}



# end 
>Release-Note:
>Audit-Trail:
>Unformatted: