Date: Wed, 13 Jul 2005 19:36:06 -0300 (BRT) From: Marcus Grando <marcus@corp.grupos.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/83421: Update port: ftp/vsftpd include SSL in OPTIONS Message-ID: <20050713223606.47EB656BB@corp.grupos.com.br> Resent-Message-ID: <200507132240.j6DMeCjn032908@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
@@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050713223606.47EB656BB>