Date: Fri, 26 Sep 2014 20:43:30 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369343 - in head: . ftp ftp/vsftpd-ext Message-ID: <201409262043.s8QKhUI6075435@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Fri Sep 26 20:43:29 2014 New Revision: 369343 URL: http://svnweb.freebsd.org/changeset/ports/369343 QAT: https://qat.redports.org/buildarchive/r369343/ Log: ftp/vsftpd-ext: resurrect, upgrade 2.3.5 -> 3.0.2, stagify Extended build of vsftpd with additional features. WWW: http://vsftpd.devnet.ru/eng/ PR: 193916 Submitted by: Xu Jing <xjflyttp@gmail.com> Added: head/ftp/vsftpd-ext/ - copied from r366684, head/ftp/vsftpd-ext/ Modified: head/MOVED head/ftp/Makefile head/ftp/vsftpd-ext/Makefile head/ftp/vsftpd-ext/distinfo head/ftp/vsftpd-ext/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Fri Sep 26 20:42:20 2014 (r369342) +++ head/MOVED Fri Sep 26 20:43:29 2014 (r369343) @@ -6611,7 +6611,6 @@ emulators/psim-freebsd||2014-09-01|Not s emulators/vMac||2014-09-01|Not staged finance/opentaxsolver||2014-09-01|Not staged french/facturier||2014-09-01|Not staged -ftp/vsftpd-ext||2014-09-01|Not staged games/actx||2014-09-01|Not staged games/atitd||2014-09-01|Not staged games/avp-demo||2014-09-01|Not staged Modified: head/ftp/Makefile ============================================================================== --- head/ftp/Makefile Fri Sep 26 20:42:20 2014 (r369342) +++ head/ftp/Makefile Fri Sep 26 20:43:29 2014 (r369343) @@ -96,6 +96,7 @@ SUBDIR += uftp SUBDIR += urlgfe SUBDIR += vsftpd + SUBDIR += vsftpd-ext SUBDIR += waiho SUBDIR += weex SUBDIR += wget Modified: head/ftp/vsftpd-ext/Makefile ============================================================================== --- head/ftp/vsftpd-ext/Makefile Sat Aug 30 21:49:21 2014 (r366684) +++ head/ftp/vsftpd-ext/Makefile Fri Sep 26 20:43:29 2014 (r369343) @@ -3,60 +3,88 @@ PORTNAME= vsftpd-ext PORTVERSION= ${UPSTREAMVERSION}.${EXTVERSION} -PORTREVISION= 1 CATEGORIES= ftp ipv6 MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/ PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2} DISTNAME= vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION} EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= xjflyttp@gmail.com COMMENT= FTP daemon that aims to be "very secure". Extended build -CONFLICTS= vsftpd-2* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-2* +LICENSE= GPLv2 -UPSTREAMVERSION= 2.3.5 +UPSTREAMVERSION=3.0.2 EXTVERSION= 1 -WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION} +USES+= gmake +WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION} ALL_TARGET= vsftpd -MAN5= vsftpd.conf.5 -MAN8= vsftpd.8 + +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 SSL DOCS -OPTIONS_DEFAULT= RC_SCRIPT +OPTIONS_DEFINE= RC_SCRIPT VSFTPD_SSL DOCS +OPTIONS_DEFAULT=RC_SCRIPT DOCS RC_SCRIPT_DESC= install RC_SCRIPT -NO_STAGE= yes +VSFTPD_SSL_DESC=Include support for SSL + +CONFLICTS= vsftpd-3* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-3* + .include <bsd.port.options.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 +BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 +CC= clang33 +.endif + .if ${PORT_OPTIONS:MRC_SCRIPT} USE_RC_SUBR= vsftpd .endif -.if ${PORT_OPTIONS:MSSL} -USE_OPENSSL= yes +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) +.include "${PORTSDIR}/Mk/bsd.openssl.mk" SSL_SUFFIX= -ssl CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif do-configure: - ${REINPLACE_CMD} -e "s|/etc/vsftpd|${PREFIX}/etc|" \ +.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 - ${REINPLACE_CMD} \ +.endif + ${REINPLACE_CMD} -e "s|\"vsftpd.conf\"|\"${PREFIX}/etc/vsftpd.conf\"|" \ + ${WRKSRC}/defs.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 - ${REINPLACE_CMD} -e \ - "s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \ - ${WRKSRC}/builddefs.h + @${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \ ${WRKSRC}/vsftpd.conf @${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "" @@ -64,43 +92,22 @@ do-configure: "# 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|/etc/v|${PREFIX}/etc/v|" \ - -e 's|delay_failed_logins|delay_failed_login|' \ - -e 's|delay_successful_logins|delay_successful_login|' \ - ${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c -.if ${PORT_OPTIONS:MSSL} - ${REINPLACE_CMD} -e \ - "s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \ - ${WRKSRC}/builddefs.h -.endif - -pre-install: - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + ${REINPLACE_CMD} -e "s|^listen=.*|listen=NO|" \ + ${WRKSRC}/vsftpd.conf do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/ - ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist - ${INSTALL} -d ${PREFIX}/share/vsftpd/empty - @if [ ! -e ${PREFIX}/etc/vsftpd.conf ]; then \ - ${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/ ; \ - fi - ${MKDIR} ${PREFIX}/share/vsftpd/empty - @for i in ${MAN8} ; do \ - ${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man8/ ; \ - done - @for i in ${MAN5} ; do \ - ${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \ - done - ${MKDIR} /var/ftp + ${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} ${DOCSDIR} -.for i in ${DOCFILES} - ${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR} -.endfor + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .for i in EXAMPLE SECURITY - ${MKDIR} ${DOCSDIR}/${i} - ${CP} -p -R -L ${WRKSRC}/${i}/./ ${DOCSDIR}/${i}/ - ${CHMOD} -R -L a+rX,go-w ${DOCSDIR}/${i}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} + ${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/ + ${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/ .endfor .endif Modified: head/ftp/vsftpd-ext/distinfo ============================================================================== --- head/ftp/vsftpd-ext/distinfo Sat Aug 30 21:49:21 2014 (r366684) +++ head/ftp/vsftpd-ext/distinfo Fri Sep 26 20:43:29 2014 (r369343) @@ -1,2 +1,2 @@ -SHA256 (vsFTPd-2.3.5-ext1.tgz) = 2eeee4955565e6d6f9b21ab9a199689488d6d62c0024f6415dbd4510f85d43fe -SIZE (vsFTPd-2.3.5-ext1.tgz) = 222249 +SHA256 (vsFTPd-3.0.2-ext1.tgz) = c276f25e5525dc1b104bde8c437a5a9c0cb0efed16056519214d1b9d71497c7d +SIZE (vsFTPd-3.0.2-ext1.tgz) = 227801 Modified: head/ftp/vsftpd-ext/pkg-plist ============================================================================== --- head/ftp/vsftpd-ext/pkg-plist Sat Aug 30 21:49:21 2014 (r366684) +++ head/ftp/vsftpd-ext/pkg-plist Fri Sep 26 20:43:29 2014 (r369343) @@ -1,21 +1,31 @@ libexec/vsftpd -@exec mkdir -p %D/share/vsftpd/empty -@unexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi -etc/vsftpd.conf.dist -@exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi +man/man5/vsftpd.conf.5.gz +man/man8/vsftpd.8.gz +@sample etc/vsftpd.conf.sample +@dirrmtry /var/ftp @exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi -@unexec rmdir /var/ftp 2>/dev/null || true -@dirrm share/vsftpd/empty -@dirrm share/vsftpd +@dir share/vsftpd/empty %%PORTDOCS%%%%DOCSDIR%%/AUDIT %%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/Changelog -%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403.html -%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse_line.html -%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse.html +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.security +%%PORTDOCS%%%%DOCSDIR%%/README.ssl +%%PORTDOCS%%%%DOCSDIR%%/REFS +%%PORTDOCS%%%%DOCSDIR%%/REWARD +%%PORTDOCS%%%%DOCSDIR%%/SIZE +%%PORTDOCS%%%%DOCSDIR%%/SPEED +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/TUNING %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403-serv.html +%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403.html %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/404.html +%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse.html +%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse_line.html %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/README %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.conf %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.xinetd @@ -30,29 +40,10 @@ etc/vsftpd.conf.dist %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/vsftpd.conf %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/vsftpd.pam %%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2/README -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%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 %%PORTDOCS%%%%DOCSDIR%%/SECURITY/OVERVIEW %%PORTDOCS%%%%DOCSDIR%%/SECURITY/TRUST -%%PORTDOCS%%%%DOCSDIR%%/SIZE -%%PORTDOCS%%%%DOCSDIR%%/SPEED -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/TUNING -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_HOSTS -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE -%%PORTDOCS%%@dirrm %%DOCSDIR%%/SECURITY -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dir %%DOCSDIR%%/SECURITY +%%PORTDOCS%%@dir %%DOCSDIR%%/EXAMPLE +%%PORTDOCS%%@dir %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409262043.s8QKhUI6075435>