Attachment 147683 Details for Bug 193916 – use @sample, USERS=ftp GROUPS=ftp, trim @dirrm

[patch] use @sample, USERS=ftp GROUPS=ftp, trim @dirrm

vsftpd-ext-2.3.5.1_1.diff (text/plain), 5.79 KB, created by Xu Jing on 2014-09-26 07:56:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xu Jing

Created: 2014-09-26 07:56:43 UTC

Size: 5.79 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 366889)
>+++ Makefile	(working copy)
>@@ -18,10 +18,11 @@
> UPSTREAMVERSION=	2.3.5
> EXTVERSION=	1
> 
>+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
>@@ -30,7 +31,6 @@
> OPTIONS_DEFAULT=	RC_SCRIPT
> RC_SCRIPT_DESC=	install RC_SCRIPT
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MRC_SCRIPT}
>@@ -45,6 +45,11 @@
> .endif
> 
> do-configure:
>+.if ${PORT_OPTIONS:MSSL} && !defined(WITHOUT_SSL)
>+	${REINPLACE_CMD} -e \
>+		"s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \
>+		${WRKSRC}/builddefs.h
>+.endif
> 	${REINPLACE_CMD} -e "s|/etc/vsftpd|${PREFIX}/etc|" \
> 		${WRKSRC}/builddefs.h
> 	${REINPLACE_CMD} \
>@@ -68,39 +73,20 @@
> 		-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
>-
> 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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 366889)
>+++ pkg-plist	(working copy)
>@@ -1,35 +1,13 @@
> 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
> @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%%/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
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD/README
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG/README
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG/hosts.allow
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/README
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_HOSTS/README
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/README
>-%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/logins.txt
>-%%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
>@@ -38,21 +16,10 @@
> %%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