diff options
| -rw-r--r-- | ftp/vsftpd/Makefile | 21 | ||||
| -rw-r--r-- | ftp/vsftpd/distinfo | 4 | ||||
| -rw-r--r-- | ftp/vsftpd/pkg-plist | 2 |
3 files changed, 22 insertions, 5 deletions
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile index e725bba53177..89c1d5d305af 100644 --- a/ftp/vsftpd/Makefile +++ b/ftp/vsftpd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= vsftpd -PORTVERSION= 1.2.2 +PORTVERSION= 2.0.1 CATEGORIES= ftp ipv6 MASTER_SITES= ftp://vsftpd.beasts.org/users/cevans/ @@ -18,14 +18,24 @@ ALL_TARGET= vsftpd MAN5= vsftpd.conf.5 MAN8= vsftpd.8 DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \ - README README.security REWARD SIZE SPEED TODO TUNING + README README.security README.ssl REFS REWARD \ + SIZE SPEED TODO TUNING + +.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL) +USE_OPENSSL= yes +CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} +.endif .include <bsd.port.pre.mk> do-configure: ${REINPLACE_CMD} -e "s=/etc/vsftpd.conf=${PREFIX}/etc/vsftpd.conf=" \ ${WRKSRC}/defs.h - ${REINPLACE_CMD} -e "s/^CFLAGS =/CFLAGS +=/" \ + ${REINPLACE_CMD} \ + -e "s|^CC = gcc|CC = ${CC}|" \ + -e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \ + -e "s| -Wl,-s| -Wl,-s ${LDFLAGS}|" \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e \ "s/#undef VSF_BUILD_TCPWRAPPERS/#define VSF_BUILD_TCPWRAPPERS 1/" \ @@ -34,6 +44,11 @@ do-configure: ${WRKSRC}/vsftpd.conf ${REINPLACE_CMD} -e "s=/etc/v=${PREFIX}/etc/v=" \ ${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c +.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL) + ${REINPLACE_CMD} -e \ + "s/#undef VSF_BUILD_SSL/#define VSF_BUILD_SSL 1/" \ + ${WRKSRC}/builddefs.h +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/ diff --git a/ftp/vsftpd/distinfo b/ftp/vsftpd/distinfo index a9a26ae96459..0f5d94f3a102 100644 --- a/ftp/vsftpd/distinfo +++ b/ftp/vsftpd/distinfo @@ -1,2 +1,2 @@ -MD5 (vsftpd-1.2.2.tar.gz) = 5a38e1c69062e7688fbbdae6d1196de2 -SIZE (vsftpd-1.2.2.tar.gz) = 136669 +MD5 (vsftpd-2.0.1.tar.gz) = 63838791ec8b1375ed154fb2603e52e9 +SIZE (vsftpd-2.0.1.tar.gz) = 146231 diff --git a/ftp/vsftpd/pkg-plist b/ftp/vsftpd/pkg-plist index b9c6ea4fcae5..9460fe25cea2 100644 --- a/ftp/vsftpd/pkg-plist +++ b/ftp/vsftpd/pkg-plist @@ -30,6 +30,8 @@ etc/vsftpd.conf.dist %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.security +%%PORTDOCS%%%%DOCSDIR%%/README.ssl +%%PORTDOCS%%%%DOCSDIR%%/REFS %%PORTDOCS%%%%DOCSDIR%%/REWARD %%PORTDOCS%%%%DOCSDIR%%/SECURITY/DESIGN %%PORTDOCS%%%%DOCSDIR%%/SECURITY/IMPLEMENTATION |