Index: head/ftp/vsftpd/Makefile =================================================================== --- head/ftp/vsftpd/Makefile (revision 297351) +++ head/ftp/vsftpd/Makefile (revision 297352) @@ -1,103 +1,107 @@ # New ports collection makefile for: vsftpd # Date created: 03 Feb 2001 # Whom: Neil Blakey-Milner # # $FreeBSD$ # PORTNAME= vsftpd -PORTVERSION= 2.3.5 +PORTVERSION= 3.0.0 CATEGORIES= ftp ipv6 MASTER_SITES= https://security.appspot.com/downloads/ PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= A FTP daemon that aims to be "very secure" LICENSE= GPLv2 ALL_TARGET= vsftpd MAN5= vsftpd.conf.5 MAN8= vsftpd.8 USE_RC_SUBR= vsftpd.sh DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \ README README.security README.ssl REFS REWARD \ SIZE SPEED TODO TUNING -OPTIONS= VSFTPD_SSL "Include support for SSL" off \ - PIDFILE "unofficial support for pidfile" off +OPTIONS= VSFTPD_SSL "Include support for SSL" off \ + PIDFILE "unofficial support for pidfile" off .include .if defined(WITH_VSFTPD_SSL) && !defined(WITHOUT_SSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" SSL_SUFFIX= -ssl CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .endif .if defined(WITH_PIDFILE) EXTRA_PATCHES+= ${FILESDIR}/pidfile.patch .endif +# BROKEN on FreeBSD with undefined reference to `__stack_chk_fail_local' +LDFLAGS+= -lssp_nonshared + do-configure: - ${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \ +.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_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|^listen=|#listen=|" \ + -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \ ${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf + ${REINPLACE_CMD} -e "s|/etc/v|${PREFIX}/etc/v|" \ + ${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c ${REINPLACE_CMD} \ -e "s|^CC = gcc|CC = ${CC}|" \ -e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \ -e "s|^INSTALL =|INSTALL = ${INSTALL_PROGRAM}|" \ -e "s| -Wl,-s| -Wl,-s ${LDFLAGS}|" \ ${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 "" @${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|/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 !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL) - ${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 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 .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for i in ${DOCFILES} ${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR} .endfor .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}/ .endfor .endif .include Property changes on: head/ftp/vsftpd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.51 \ No newline at end of property +1.52 \ No newline at end of property Index: head/ftp/vsftpd/distinfo =================================================================== --- head/ftp/vsftpd/distinfo (revision 297351) +++ head/ftp/vsftpd/distinfo (revision 297352) @@ -1,2 +1,2 @@ -SHA256 (vsftpd-2.3.5.tar.gz) = d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1 -SIZE (vsftpd-2.3.5.tar.gz) = 187691 +SHA256 (vsftpd-3.0.0.tar.gz) = ef70205dcd0c7f03b008b9578fb44c0cbe31e66daab8cfafb9904747c17fc2a8 +SIZE (vsftpd-3.0.0.tar.gz) = 193166 Property changes on: head/ftp/vsftpd/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.27 \ No newline at end of property +1.28 \ No newline at end of property Index: head/ftp/vsftpd/files/patch-sysdeputil.c =================================================================== --- head/ftp/vsftpd/files/patch-sysdeputil.c (revision 297351) +++ head/ftp/vsftpd/files/patch-sysdeputil.c (revision 297352) @@ -1,31 +1,44 @@ ---- sysdeputil.c.orig 2010-03-26 06:25:33.000000000 +0300 -+++ sysdeputil.c 2011-05-17 20:51:35.350022421 +0400 +--- sysdeputil.c.orig 2010-03-26 04:25:33.000000000 +0100 ++++ sysdeputil.c 2012-04-14 10:31:00.000000000 +0200 @@ -57,7 +57,7 @@ #endif #define VSF_SYSDEP_HAVE_SHADOW #define VSF_SYSDEP_HAVE_USERSHELL -#define VSF_SYSDEP_HAVE_LIBCAP +#undef VSF_SYSDEP_HAVE_LIBCAP #define VSF_SYSDEP_HAVE_UTMPX #define __USE_GNU -@@ -1213,7 +1213,9 @@ vsf_insert_uwtmp(const struct mystr* p_u +@@ -323,8 +323,12 @@ + const struct mystr* p_remote_host) + { + int retval; ++#ifdef PAM_USER + pam_item_t item; ++#endif ++#ifdef PAM_RUSER + const char* pam_user_name = 0; ++#endif + struct pam_conv the_conv = + { + &pam_conv_func, +@@ -1213,7 +1217,9 @@ setutxent(); (void) pututxline(&s_utent); endutxent(); +#if !defined(__FreeBSD__) updwtmpx(WTMPX_FILE, &s_utent); +#endif } void -@@ -1232,7 +1234,9 @@ vsf_remove_uwtmp(void) +@@ -1232,7 +1238,9 @@ (void) pututxline(&s_utent); endutxent(); s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec(); +#if !defined(__FreeBSD__) updwtmpx(WTMPX_FILE, &s_utent); +#endif } #endif /* !VSF_SYSDEP_HAVE_UTMPX */ Property changes on: head/ftp/vsftpd/files/patch-sysdeputil.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property