From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 21 06:00:23 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F79D106568D for ; Thu, 21 Jan 2010 06:00:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0523C8FC0C for ; Thu, 21 Jan 2010 06:00:23 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0L60Mu3094539 for ; Thu, 21 Jan 2010 06:00:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0L60MNg094538; Thu, 21 Jan 2010 06:00:22 GMT (envelope-from gnats) Date: Thu, 21 Jan 2010 06:00:22 GMT Message-Id: <201001210600.o0L60MNg094538@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: zloidemon Cc: Subject: Re: ports/143018: Update port: ftp/proftpd-devel added support SFTP X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: zloidemon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2010 06:00:23 -0000 The following reply was made to PR ports/143018; it has been noted by GNATS. From: zloidemon To: bug-followup@freebsd.org, g.veniamin@googlemail.com Cc: Subject: Re: ports/143018: Update port: ftp/proftpd-devel added support SFTP Date: Thu, 21 Jan 2010 12:50:46 +0700 --Boundary-00=_3s+VLNHHRtyD2io Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit corrected patch --Boundary-00=_3s+VLNHHRtyD2io Content-Type: text/x-patch; charset="UTF-8"; name="patch_sftp-proftpd-devel-1.3.3rc2" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch_sftp-proftpd-devel-1.3.3rc2" diff -ruN proftpd-devel.orig/Makefile proftpd-devel/Makefile --- proftpd-devel.orig/Makefile 2010-01-21 12:43:13.000000000 +0700 +++ proftpd-devel/Makefile 2010-01-21 12:44:26.000000000 +0700 @@ -7,7 +7,7 @@ PORTNAME= proftpd DISTVERSION= 1.3.3rc2 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp1.at.proftpd.org/distrib/source/ \ @@ -32,7 +32,8 @@ PORTDOCSdoc= Configuration.html faq.html PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \ mod_tls.html mod_wrap2.html mod_wrap2_file.html mod_wrap2_sql.html \ - mod_ban.html mod_quotatab_radius.html ftpasswd.html + mod_ban.html mod_quotatab_radius.html ftpasswd.html mod_sftp.html \ + mod_sftp_sql.html mod_sftp_pam.html PORTDOCSmodule= mod_auth_file.html mod_auth_pam.html mod_cap.html mod_ctrls.html \ mod_delay.html mod_dso.html mod_facl.html mod_facts.html \ mod_ident.html mod_lang.html @@ -85,7 +86,10 @@ NLS "Use nls (builds mod_lang)" off \ UNIQUE "Include mod_unique_id" off \ CLAMAV "Include mod_clamav" off \ - DIGEST "Include mod_digest" off + DIGEST "Include mod_digest" off \ + SFTP "Include mod_sftp" off\ + SFTP_SQL "Include mod_sftp_sql" off \ + SFTP_PAM "Include mod_sftp_pam" off MODULES?= LIBDIRS?= @@ -267,6 +271,37 @@ MODULES:=${MODULES}:mod_digest .endif +.if defined(WITH_SFTP) +USE_SQLITE= yes +MODULES:=${MODULES}:mod_sftp +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +PLIST_SUB+= SFTP="" +PLIST_FILES+= include/${PORTNAME}/mod_sftp.h +.else +PLIST_SUB+= SFTP="@comment " +.endif + +.if defined(WITH_SFTP_SQL) +USE_SQLITE= yes +MODULES:=${MODULES}:mod_sftp_sql +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +PLIST_SUB+= SFTP_SQL="" +.else +PLIST_SUB+= SFTP_SQL="@comment " +.endif + +.if defined(WITH_SFTP_PAM) +USE_SQLITE= yes +MODULES:=${MODULES}:mod_sftp_pam +INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include +LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +PLIST_SUB+= SFTP_PAM="" +.else +PLIST_SUB+= SFTP_PAM="@comment " +.endif + # mod_ifsession should be the last item in the modules list .if !defined(WITHOUT_IFSESSION) MODULES:=${MODULES}:mod_ifsession --Boundary-00=_3s+VLNHHRtyD2io--