From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 30 00:50:17 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2BD237B404 for ; Wed, 30 Apr 2003 00:50:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 876CD43FA3 for ; Wed, 30 Apr 2003 00:50:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3U7oFUp032440 for ; Wed, 30 Apr 2003 00:50:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3U7oFe8032439; Wed, 30 Apr 2003 00:50:15 -0700 (PDT) Resent-Date: Wed, 30 Apr 2003 00:50:15 -0700 (PDT) Resent-Message-Id: <200304300750.h3U7oFe8032439@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, Oleg Sharoiko Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4FDD37B401; Wed, 30 Apr 2003 00:47:01 -0700 (PDT) Received: from brain.cc.rsu.ru (brain.cc.rsu.ru [195.208.252.154]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F6B043F75; Wed, 30 Apr 2003 00:47:00 -0700 (PDT) (envelope-from os@brain.cc.rsu.ru) Received: from brain.cc.rsu.ru (os@localhost [127.0.0.1]) by brain.cc.rsu.ru (8.12.9/8.12.9) with ESMTP id h3U7ksq4074001; Wed, 30 Apr 2003 11:46:54 +0400 (MSD) (envelope-from os@brain.cc.rsu.ru) Received: (from os@localhost) by brain.cc.rsu.ru (8.12.9/8.12.9/Submit) id h3U7ksuC074000; Wed, 30 Apr 2003 11:46:54 +0400 (MSD) (envelope-from os) Message-Id: <200304300746.h3U7ksuC074000@brain.cc.rsu.ru> Date: Wed, 30 Apr 2003 11:46:54 +0400 (MSD) From: Oleg Sharoiko To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: sf@FreeBSD.org Subject: ports/51613: [patch] ftp/wget uses USE_OPENSSL and can not be built with openssl from ports X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Oleg Sharoiko List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2003 07:50:17 -0000 >Number: 51613 >Category: ports >Synopsis: [patch] ftp/wget uses USE_OPENSSL and can not be built with openssl from ports >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 30 00:50:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Oleg Sharoiko >Release: FreeBSD 4.8-RELEASE i386 >Organization: >Environment: System: FreeBSD brain.cc.rsu.ru 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Mon Apr 28 11:38:32 GMT 2003 os@make.cc.rsu.ru:/usr/src/sys/compile/brain.k7.RELENG_4.2003-04-25 i386 >Description: ftp/wget uses USE_OPENSSL from bsd.port.mk but starting from the moment when openssl was added to the base system bsd.port.mk disallows the usage of openssl from ports. A new approach seem to exist: security/openssl provides bsd.openssl.mk which gives much more flexibility and allows to use any version of openssl. The required version can be specified at the build time by adding one of the options supported by bsd.openssl.mk If no preference was given bsd.openssl.mk has a resonable default behaviour to use openssl from base system when it is up to date and give preference to version from ports if it's already installed. >How-To-Repeat: >Fix: The following patch will switch from bsd.port.mk to bsd.port.pre.mk/bsd.port.post.mk/bsd.openssl.mk Unfortunately I can not currently test it with the up to date openssl in base system but I believe it will be ok. --- Makefile 25 Apr 2003 11:11:26 -0000 1.62 +++ Makefile 30 Apr 2003 07:25:38 -0000 @@ -20,6 +20,10 @@ MAINTAINER= sf@FreeBSD.org COMMENT= Retrieve files from the Net via HTTP and FTP +# +# SSL support can be disabled by specifying WITHOUT_SSL=yes +# + LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext USE_REINPLACE= yes @@ -27,11 +31,6 @@ USE_GMAKE= yes GNU_CONFIGURE= yes -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS= --with-ssl=no -.else -USE_OPENSSL= yes -.endif CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ LIBS=-L${LOCALBASE}/lib @@ -48,4 +47,11 @@ post-install: install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir -.include +.include +.if defined(WITHOUT_SSL) +CONFIGURE_ARGS= --with-ssl=no +.else +.include "${PORTSDIR}/security/openssl/bsd.openssl.mk" +CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} +.endif +.include >Release-Note: >Audit-Trail: >Unformatted: