From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 13 22:40:20 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 375C716A429 for ; Wed, 13 Jul 2005 22:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5302A43D64 for ; Wed, 13 Jul 2005 22:40:13 +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 j6DMeCN7032909 for ; Wed, 13 Jul 2005 22:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6DMeCjn032908; Wed, 13 Jul 2005 22:40:12 GMT (envelope-from gnats) Resent-Date: Wed, 13 Jul 2005 22:40:12 GMT Resent-Message-Id: <200507132240.j6DMeCjn032908@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, Marcus Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68F0D16A41C; Wed, 13 Jul 2005 22:36:08 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from gwmail1.grupos.com.br (gwmail1.grupos.com.br [66.90.64.125]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2789C43D46; Wed, 13 Jul 2005 22:36:08 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from corp.grupos.com.br (unknown [150.162.166.55]) by gwmail1.grupos.com.br (Postfix) with ESMTP id 3A8563BD6B; Wed, 13 Jul 2005 19:36:07 -0300 (BRT) Received: from corp.grupos.com.br (localhost [127.0.0.1]) by corp.grupos.com.br (Postfix) with ESMTP id 6608C56BC; Wed, 13 Jul 2005 19:36:06 -0300 (BRT) Received: by corp.grupos.com.br (Postfix, from userid 0) id 47EB656BB; Wed, 13 Jul 2005 19:36:06 -0300 (BRT) Message-Id: <20050713223606.47EB656BB@corp.grupos.com.br> Date: Wed, 13 Jul 2005 19:36:06 -0300 (BRT) From: Marcus Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dinoex@FreeBSD.org Subject: ports/83421: Update port: ftp/vsftpd include SSL in OPTIONS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 22:40:20 -0000 >Number: 83421 >Category: ports >Synopsis: Update port: ftp/vsftpd include SSL in OPTIONS >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: Wed Jul 13 22:40:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Marcus Grando >Release: FreeBSD 4.11-STABLE i386 >Organization: Grupos Internet S/A >Environment: System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon Jul 11 10:07:29 BRT 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386 >Description: - Include SSL in OPTIONS like (lang/php4, mail/courier-imap, mail/qmail, etc) >How-To-Repeat: >Fix: --- vsftpd.patch begins here --- diff -ruN vsftpd.orig/Makefile vsftpd/Makefile --- vsftpd.orig/Makefile Tue May 3 01:04:36 2005 +++ vsftpd/Makefile Wed Jul 13 19:34:24 2005 @@ -23,15 +23,8 @@ LDFLAGS+= -lwrap -OPTIONS= RC_NG "install RC_NG script" off - -.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL) -USE_OPENSSL= yes -CFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -.else -MAKE_ENV+= LDFLAGS="${LDFLAGS}" -.endif +OPTIONS= RC_NG "install RC_NG script" off \ + VSFTPD_SSL "Include support for SSL" off .include @@ -40,6 +33,14 @@ PLIST_SUB+= RC_NG="" .else PLIST_SUB+= RC_NG="@comment " +.endif + +.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL) +.include "${PORTSDIR}/Mk/bsd.openssl.mk" +CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} +.else +MAKE_ENV+= LDFLAGS="${LDFLAGS}" .endif do-configure: --- vsftpd.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: