Index: head/ftp/vsftpd-ext/Makefile =================================================================== --- head/ftp/vsftpd-ext/Makefile (revision 470421) +++ head/ftp/vsftpd-ext/Makefile (revision 470422) @@ -1,110 +1,109 @@ # Created by: Maxim Ignatenko # $FreeBSD$ PORTNAME= vsftpd-ext PORTVERSION= ${UPSTREAMVERSION}.${EXTVERSION} -PORTREVISION= 2 CATEGORIES= ftp ipv6 MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/ PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION} MAINTAINER= xjflyttp@gmail.com COMMENT= FTP daemon that aims to be "very secure". Extended build LICENSE= GPLv2 -UPSTREAMVERSION=3.0.2 +UPSTREAMVERSION=3.0.3 EXTVERSION= 1 USES= alias gmake tar:tgz WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION} ALL_TARGET= vsftpd USERS= ftp GROUPS= ftp DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \ README README.security README.ssl REFS REWARD \ SIZE SPEED TODO TUNING OPTIONS_DEFINE= RC_SCRIPT VSFTPD_SSL DOCS OPTIONS_DEFAULT=RC_SCRIPT RC_SCRIPT_DESC= install RC_SCRIPT VSFTPD_SSL_DESC=Include support for SSL CONFLICTS= vsftpd-3* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-3* .include .if ${PORT_OPTIONS:MRC_SCRIPT} USE_RC_SUBR= vsftpd .endif VSFTPD_OPTIMIZED= ${CFLAGS:M-O*} .if defined(CFLAGS) && !empty(VSFTPD_OPTIMIZED) VSFTPD_NO_OPTIMIZED= -e "s|-O2 ||" .endif .if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL) USES+= ssl SSL_SUFFIX= -ssl CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif do-configure: .if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL) ${REINPLACE_CMD} -e \ "s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \ -e "s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \ ${WRKSRC}/builddefs.h .else ${REINPLACE_CMD} -e \ "s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \ ${WRKSRC}/builddefs.h .endif ${REINPLACE_CMD} -e \ "s|#define VSF_CONFIG_PATH \"/etc/vsftpd/\"|#define VSF_CONFIG_PATH \"${PREFIX}/etc/\"|" \ -e "s|#define VSF_CONFIG_PREFIX \"\"|#define VSF_CONFIG_PREFIX \"vsftpd.\"|" \ ${WRKSRC}/builddefs.h ${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \ ${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${REINPLACE_CMD} -e "s|/usr/share/empty|${PREFIX}/share/vsftpd/empty|" \ ${WRKSRC}/tunables.c ${REINPLACE_CMD} ${VSFTPD_NO_OPTIMIZED} \ -e '/^CC/s/=/?=/' \ -e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \ -e '/^LIBS/s|=.*|= `./vsf_findlibs.sh`|' \ -e '/^LINK/s/=.*/=/' \ -e 's|-Werror||' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh @${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \ ${WRKSRC}/vsftpd.conf @${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "" @${ECHO_CMD} >>${WRKSRC}/vsftpd.conf \ "# If using vsftpd in standalone mode, uncomment the next two lines:" @${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# listen=YES" @${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# background=YES" ${REINPLACE_CMD} -e "s|^listen=.*|listen=NO|" \ ${WRKSRC}/vsftpd.conf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${STAGEDIR}${PREFIX}/etc/vsftpd.conf.sample ${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5/ ${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${STAGEDIR}${PREFIX}/man/man8/ ${MKDIR} ${STAGEDIR}/var/ftp ${STAGEDIR}${PREFIX}/share/vsftpd/empty .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .for i in EXAMPLE SECURITY ${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} ${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/ .endfor .endif .include Index: head/ftp/vsftpd-ext/distinfo =================================================================== --- head/ftp/vsftpd-ext/distinfo (revision 470421) +++ head/ftp/vsftpd-ext/distinfo (revision 470422) @@ -1,2 +1,3 @@ -SHA256 (vsFTPd-3.0.2-ext1.tgz) = c276f25e5525dc1b104bde8c437a5a9c0cb0efed16056519214d1b9d71497c7d -SIZE (vsFTPd-3.0.2-ext1.tgz) = 227801 +TIMESTAMP = 1523611798 +SHA256 (vsFTPd-3.0.3-ext1.tgz) = 9d0e83657d51b58a91c1d138375e10ed03555fc061f357b15e37dc89de71b593 +SIZE (vsFTPd-3.0.3-ext1.tgz) = 230764 Index: head/ftp/vsftpd-ext/files/patch-utility =================================================================== --- head/ftp/vsftpd-ext/files/patch-utility (revision 470421) +++ head/ftp/vsftpd-ext/files/patch-utility (nonexistent) @@ -1,13 +0,0 @@ ---- utility.c.orig 2012-10-26 20:05:38 UTC -+++ utility.c -@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_ - void - bug(const char* p_text) - { -+ static int inside_bug = 0; -+ if (inside_bug) -+ vsf_sysutil_exit(1); -+ inside_bug++; - /* Rats. Try and write the reason to the network for diagnostics */ - vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD); - (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10); Property changes on: head/ftp/vsftpd-ext/files/patch-utility ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ftp/vsftpd-ext/files/patch-sysstr.c =================================================================== --- head/ftp/vsftpd-ext/files/patch-sysstr.c (nonexistent) +++ head/ftp/vsftpd-ext/files/patch-sysstr.c (revision 470422) @@ -0,0 +1,11 @@ +--- sysstr.c.orig 2012-01-03 09:51:23 UTC ++++ sysstr.c +@@ -74,7 +74,7 @@ str_chdir(const struct mystr* p_str) + int + str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode) + { +- enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown; ++ enum EVSFSysUtilOpenMode open_mode = (enum EVSFSysUtilOpenMode) kVSFSysStrOpenUnknown; + switch (mode) + { + case kVSFSysStrOpenReadOnly: Property changes on: head/ftp/vsftpd-ext/files/patch-sysstr.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/ftp/vsftpd-ext/files/patch-utility.c =================================================================== --- head/ftp/vsftpd-ext/files/patch-utility.c (nonexistent) +++ head/ftp/vsftpd-ext/files/patch-utility.c (revision 470422) @@ -0,0 +1,13 @@ +--- utility.c.orig 2012-09-23 00:14:36 UTC ++++ utility.c +@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_ + void + bug(const char* p_text) + { ++ static int inside_bug = 0; ++ if (inside_bug) ++ vsf_sysutil_exit(1); ++ inside_bug++; + /* Rats. Try and write the reason to the network for diagnostics */ + vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD); + (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10); Property changes on: head/ftp/vsftpd-ext/files/patch-utility.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property