From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 25 09:40:06 2005 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 B2CCD16A4CE for ; Mon, 25 Apr 2005 09:40:06 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69C5343D45 for ; Mon, 25 Apr 2005 09:40:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3P9e6Q2052752 for ; Mon, 25 Apr 2005 09:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3P9e6me052751; Mon, 25 Apr 2005 09:40:06 GMT (envelope-from gnats) Resent-Date: Mon, 25 Apr 2005 09:40:06 GMT Resent-Message-Id: <200504250940.j3P9e6me052751@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, Jean-Baptiste Quenot Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C14A516A4CE for ; Mon, 25 Apr 2005 09:31:11 +0000 (GMT) Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F20D43D1F for ; Mon, 25 Apr 2005 09:31:11 +0000 (GMT) (envelope-from jbq@anyware-tech.com) Received: from vision.anyware (10.21.96-84.rev.gaoland.net [84.96.21.10]) by caraldi.com (Postfix) with ESMTP id 3CE38615E for ; Mon, 25 Apr 2005 11:31:10 +0200 (CEST) Received: by vision.anyware (Postfix, from userid 1021) id 4FF416109; Mon, 25 Apr 2005 11:31:11 +0200 (CEST) Message-Id: <20050425093111.4FF416109@vision.anyware> Date: Mon, 25 Apr 2005 11:31:11 +0200 (CEST) From: Jean-Baptiste Quenot To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80320: Maintainer update: unbreak www/resin3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2005 09:40:06 -0000 >Number: 80320 >Category: ports >Synopsis: Maintainer update: unbreak www/resin3 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 25 09:40:05 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jean-Baptiste Quenot >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD vision.anyware 5.4-STABLE FreeBSD 5.4-STABLE #0: Thu Apr 21 11:41:35 CEST 2005 jbq@vision.anyware:/usr/obj/usr/src/sys/GENERIC i386 >Description: This is an update that adresses OpenSSL problems reported by Kris Kennaway: * FreeBSD uses -lcrypto, not -lcrypt * Pick up the right OpenSSL >How-To-Repeat: >Fix: diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile --- /usr/ports/www/resin3/Makefile Thu Apr 21 00:04:55 2005 +++ ./Makefile Mon Apr 25 11:24:50 2005 @@ -18,6 +18,7 @@ HAS_CONFIGURE= yes USE_PYTHON= yes USE_REINPLACE= yes +USE_OPENSSL= yes # Customizable settings RUNASUSER?= www @@ -55,7 +56,9 @@ .include # Pass JAVA_HOME as determined by bsd.java.mk -CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} +CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \ + --with-openssl-lib=${OPENSSLLIB} \ + --with-openssl-include=${OPENSSLINC} # Install the Apache plugin if needed .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES) diff --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-configure ./files/patch-configure --- /usr/ports/www/resin3/files/patch-configure Fri Feb 25 09:54:44 2005 +++ ./files/patch-configure Mon Apr 25 11:24:41 2005 @@ -1,8 +1,6 @@ -$FreeBSD: ports/www/resin3/files/patch-configure,v 1.2 2005/02/24 22:50:29 hq Exp $ - ---- configure.orig Tue Oct 12 18:34:32 2004 -+++ configure Tue Oct 12 18:34:48 2004 -@@ -8487,20 +8487,6 @@ +--- configure.orig Wed Jan 12 00:00:26 2005 ++++ configure Mon Apr 25 11:21:46 2005 +@@ -8669,20 +8669,6 @@ # Using Perl if it's available. # PERL=`which perl` @@ -23,3 +21,23 @@ #if test -z "${LD_SHLIB}"; then # AC_MSG_ERROR([Can't determine compilation flags.]); +@@ -8947,8 +8933,8 @@ + + if test -z "${OPENSSL_LIB}"; then + foo=bar +-elif test -r "${OPENSSL_LIB}/libcrypt.so"; then +- SSL_LIBS="${SSL_LIBS} -lcrypt" ++elif test -r "${OPENSSL_LIB}/libcrypto.so"; then ++ SSL_LIBS="${SSL_LIBS} -lcrypto" + elif test -r "${OPENSSL_LIB}/libcrypt.dylib"; then + SSL_LIBS="${SSL_LIBS} -lcrypt" + elif test -r "${OPENSSL_LIB}/libcrypt.a"; then +@@ -8983,7 +8969,7 @@ + foo=bar + elif test -z "${OPENSSL_LIB}"; then + foo=bar +-elif test ! -r "${OPENSSL_LIB}/libcrypt.so" -a \ ++elif test ! -r "${OPENSSL_LIB}/libcrypto.so" -a \ + ! -r "${OPENSSL_LIB}/libcrypt.dylib" -a \ + ! -r "${OPENSSL_LIB}/libcrypt.a" ; then + { { echo "$as_me:$LINENO: error: Can't find valid OpenSSL library in ${OPENSSL_LIB}" >&5 >Release-Note: >Audit-Trail: >Unformatted: