Attachment 147684 Details for Bug 193916 – update to 3.0.2

[patch] update to 3.0.2

vsftpd-ext-3.0.2.1_1.diff (text/plain), 8.57 KB, created by Xu Jing on 2014-09-26 09:21:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xu Jing

Created: 2014-09-26 09:21:00 UTC

Size: 8.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 366889)
>+++ Makefile	(working copy)
>@@ -13,24 +13,30 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	FTP daemon that aims to be "very secure". Extended build
> 
>-CONFLICTS=	vsftpd-2* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-2*
>+CONFLICTS=	vsftpd-3* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-3*
> 
>-UPSTREAMVERSION=	2.3.5
>+UPSTREAMVERSION=	3.0.2
> EXTVERSION=	1
> 
>+BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
>+
>+USERS=	ftp
>+GROUPS=	ftp
>+
> WRKSRC=	${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
> ALL_TARGET=	vsftpd
>-MAN5=		vsftpd.conf.5
>-MAN8=		vsftpd.8
> 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
>+USES+=	gmake
>+
>+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
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MRC_SCRIPT}
>@@ -37,8 +43,13 @@
> 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}
>@@ -45,18 +56,31 @@
> .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
>-	${REINPLACE_CMD} \
>+.else
>+	${REINPLACE_CMD} -e \
>+		"s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \
>+		${WRKSRC}/builddefs.h
>+.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 +88,22 @@
> 		"# 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
>+	${REINPLACE_CMD} -e "s|^listen=.*|listen=NO|" \
>+		${WRKSRC}/vsftpd.conf
> 
>-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
>+	${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
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 366889)
>+++ distinfo	(working copy)
>@@ -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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 366889)
>+++ pkg-plist	(working copy)
>@@ -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
>+@unexec rmdir /var/ftp 2>/dev/null || true
> @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%%/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/HTTP_TEMPLATES/browse.html
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403-serv.html
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/404.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 @@
> %%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%%
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 193916: 147663 | 147683 | 147684