Attachment 147663 Details for Bug 193916 – diff base on ports tree r366889, because delete by r366890

[patch] diff base on ports tree r366889, because delete by r366890

vsftpd-ext-2.3.5.1_1.diff (text/plain), 3.90 KB, created by Xu Jing on 2014-09-25 06:16:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xu Jing

Created: 2014-09-25 06:16:05 UTC

Size: 3.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 366889)
>+++ Makefile	(working copy)
>@@ -20,8 +20,6 @@
> 
> 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 +28,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 +42,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 +70,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.dist
>+	${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,10 +1,14 @@
> libexec/vsftpd
>-@exec mkdir -p %D/share/vsftpd/empty
>+man/man5/vsftpd.conf.5.gz
>+man/man8/vsftpd.8.gz
>+@exec if ! pw groupshow ftp 2>/dev/null; then pw groupadd ftp -g 14; fi
>+@exec if ! pw usershow ftp 2>/dev/null; then pw useradd ftp -g ftp -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous FTP"; fi
> @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
>+@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
>+@exec mkdir -p %D/share/vsftpd/empty
> @dirrm share/vsftpd/empty
> @dirrm share/vsftpd
> %%PORTDOCS%%%%DOCSDIR%%/AUDIT
>@@ -55,4 +59,4 @@
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/SECURITY
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 193916: 147663 | 147683 | 147684