Attachment #147683 for bug #193916

Lines 18-27 Link Here

(-)Makefile (-32 / +18 lines)
18	UPSTREAMVERSION= 2.3.5	18	UPSTREAMVERSION= 2.3.5
19	EXTVERSION= 1	19	EXTVERSION= 1
20		20
		21	USERS= ftp
		22	GROUPS= ftp
		23
21	WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}	24	WRKSRC= ${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
22	ALL_TARGET= vsftpd	25	ALL_TARGET= vsftpd
23	MAN5= vsftpd.conf.5
24	MAN8= vsftpd.8
25	DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \	26	DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
26	README README.security README.ssl REFS REWARD \	27	README README.security README.ssl REFS REWARD \
27	SIZE SPEED TODO TUNING	28	SIZE SPEED TODO TUNING
Lines 30-36 Link Here
30	OPTIONS_DEFAULT= RC_SCRIPT	31	OPTIONS_DEFAULT= RC_SCRIPT
31	RC_SCRIPT_DESC= install RC_SCRIPT	32	RC_SCRIPT_DESC= install RC_SCRIPT
32		33
33	NO_STAGE= yes
34	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
35		35
36	.if ${PORT_OPTIONS:MRC_SCRIPT}	36	.if ${PORT_OPTIONS:MRC_SCRIPT}
Lines 45-50 Link Here
45	.endif	45	.endif
46		46
47	do-configure:	47	do-configure:
		48	.if ${PORT_OPTIONS:MSSL} && !defined(WITHOUT_SSL)
		49	${REINPLACE_CMD} -e \
		50	"s\|#undef VSF_BUILD_SSL\|#define VSF_BUILD_SSL 1\|" \
		51	${WRKSRC}/builddefs.h
		52	.endif
48	${REINPLACE_CMD} -e "s\|/etc/vsftpd\|${PREFIX}/etc\|" \	53	${REINPLACE_CMD} -e "s\|/etc/vsftpd\|${PREFIX}/etc\|" \
49	${WRKSRC}/builddefs.h	54	${WRKSRC}/builddefs.h
50	${REINPLACE_CMD} \	55	${REINPLACE_CMD} \
Lines 68-106 Link Here
68	-e 's\|delay_failed_logins\|delay_failed_login\|' \	73	-e 's\|delay_failed_logins\|delay_failed_login\|' \
69	-e 's\|delay_successful_logins\|delay_successful_login\|' \	74	-e 's\|delay_successful_logins\|delay_successful_login\|' \
70	${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c	75	${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c
71	.if ${PORT_OPTIONS:MSSL}
72	${REINPLACE_CMD} -e \
73	"s\|#undef VSF_BUILD_SSL\|#define VSF_BUILD_SSL 1\|" \
74	${WRKSRC}/builddefs.h
75	.endif
76		76
77	pre-install:
78	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
79
80	do-install:	77	do-install:
81	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/	78	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${STAGEDIR}${PREFIX}/libexec/
82	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist	79	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${STAGEDIR}${PREFIX}/etc/vsftpd.conf.sample
83	${INSTALL} -d ${PREFIX}/share/vsftpd/empty	80	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5/
84	@if [ ! -e ${PREFIX}/etc/vsftpd.conf ]; then \	81	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${STAGEDIR}${PREFIX}/man/man8/
85	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/ ; \	82	${MKDIR} ${STAGEDIR}/var/ftp ${STAGEDIR}${PREFIX}/share/vsftpd/empty
86	fi
87	${MKDIR} ${PREFIX}/share/vsftpd/empty
88	@for i in ${MAN8} ; do \
89	${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man8/ ; \
90	done
91	@for i in ${MAN5} ; do \
92	${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \
93	done
94	${MKDIR} /var/ftp
95	.if ${PORT_OPTIONS:MDOCS}	83	.if ${PORT_OPTIONS:MDOCS}
96	${MKDIR} ${DOCSDIR}	84	${MKDIR} ${STAGEDIR}${DOCSDIR}
97	.for i in ${DOCFILES}	85	${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
98	${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR}
99	.endfor
100	.for i in EXAMPLE SECURITY	86	.for i in EXAMPLE SECURITY
101	${MKDIR} ${DOCSDIR}/${i}	87	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
102	${CP} -p -R -L ${WRKSRC}/${i}/./ ${DOCSDIR}/${i}/	88	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/
103	${CHMOD} -R -L a+rX,go-w ${DOCSDIR}/${i}/	89	${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/
104	.endfor	90	.endfor
105	.endif	91	.endif
106		92




libexec/vsftpd
man/man5/vsftpd.conf.5.gz
man/man8/vsftpd.8.gz
@sample etc/vsftpd.conf.sample
@exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
@dir share/vsftpd/empty
@dirrm share/vsftpd/empty
@dirrm share/vsftpd
%%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

%%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%%@dir %%DOCSDIR%%/SECURITY
%%PORTDOCS%%@dir %%DOCSDIR%%/EXAMPLE
%%PORTDOCS%%@dir %%DOCSDIR%%
%%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%%

Return to bug 193916

Lines 1-35 Link Here

(-)pkg-plist (-40 / +7 lines)
1	libexec/vsftpd	1	libexec/vsftpd
2	@exec mkdir -p %D/share/vsftpd/empty	2	man/man5/vsftpd.conf.5.gz
3	@unexec if diff -q %D/etc/vsftpd.conf %D/etc/vsftpd.conf.dist; then rm %D/etc/vsftpd.conf; fi	3	man/man8/vsftpd.8.gz
4	etc/vsftpd.conf.dist	4	@sample etc/vsftpd.conf.sample
5	@exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi
6	@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi	5	@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi
7	@unexec rmdir /var/ftp 2>/dev/null \|\| true	6	@dir share/vsftpd/empty
8	@dirrm share/vsftpd/empty
9	@dirrm share/vsftpd
10	%%PORTDOCS%%%%DOCSDIR%%/AUDIT	7	%%PORTDOCS%%%%DOCSDIR%%/AUDIT
11	%%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS	8	%%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
12	%%PORTDOCS%%%%DOCSDIR%%/BUGS	9	%%PORTDOCS%%%%DOCSDIR%%/BUGS
13	%%PORTDOCS%%%%DOCSDIR%%/Changelog	10	%%PORTDOCS%%%%DOCSDIR%%/Changelog
14	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403.html
15	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse_line.html
16	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/browse.html
17	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/403-serv.html
18	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES/404.html
19	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/README
20	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.conf
21	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE/vsftpd.xinetd
22	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD/README
23	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
24	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG/README
25	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG/hosts.allow
26	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/README
27	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_HOSTS/README
28	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/README
29	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/logins.txt
30	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/vsftpd.conf
31	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS/vsftpd.pam
32	%%PORTDOCS%%%%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2/README
33	%%PORTDOCS%%%%DOCSDIR%%/FAQ	11	%%PORTDOCS%%%%DOCSDIR%%/FAQ
34	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	12	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
35	%%PORTDOCS%%%%DOCSDIR%%/LICENSE	13	%%PORTDOCS%%%%DOCSDIR%%/LICENSE
Lines 38-58 Link Here
38	%%PORTDOCS%%%%DOCSDIR%%/README.ssl	16	%%PORTDOCS%%%%DOCSDIR%%/README.ssl
39	%%PORTDOCS%%%%DOCSDIR%%/REFS	17	%%PORTDOCS%%%%DOCSDIR%%/REFS
40	%%PORTDOCS%%%%DOCSDIR%%/REWARD	18	%%PORTDOCS%%%%DOCSDIR%%/REWARD
41	%%PORTDOCS%%%%DOCSDIR%%/SECURITY/DESIGN
42	%%PORTDOCS%%%%DOCSDIR%%/SECURITY/IMPLEMENTATION
43	%%PORTDOCS%%%%DOCSDIR%%/SECURITY/OVERVIEW
44	%%PORTDOCS%%%%DOCSDIR%%/SECURITY/TRUST
45	%%PORTDOCS%%%%DOCSDIR%%/SIZE	19	%%PORTDOCS%%%%DOCSDIR%%/SIZE
46	%%PORTDOCS%%%%DOCSDIR%%/SPEED	20	%%PORTDOCS%%%%DOCSDIR%%/SPEED
47	%%PORTDOCS%%%%DOCSDIR%%/TODO	21	%%PORTDOCS%%%%DOCSDIR%%/TODO
48	%%PORTDOCS%%%%DOCSDIR%%/TUNING	22	%%PORTDOCS%%%%DOCSDIR%%/TUNING
49	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/HTTP_TEMPLATES	23	%%PORTDOCS%%@dir %%DOCSDIR%%/SECURITY
50	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE	24	%%PORTDOCS%%@dir %%DOCSDIR%%/EXAMPLE
51	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD	25	%%PORTDOCS%%@dir %%DOCSDIR%%
52	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG
53	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_HOSTS
54	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS
55	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2
56	%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE
57	%%PORTDOCS%%@dirrm %%DOCSDIR%%/SECURITY
58	%%PORTDOCS%%@dirrm %%DOCSDIR%%