diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2014-04-11 18:56:16 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2014-04-11 18:56:16 +0000 |
| commit | 4edd64edcd3ac7bbb8629d31edcfbe0a9d939bc8 (patch) | |
| tree | 9c136d08f67fab7161992e47bb4f259544edbb1c /ftp | |
| parent | 893d96577c5f7f2af433f68a34ce52b2d2776c34 (diff) | |
| download | ports-4edd64edcd3ac7bbb8629d31edcfbe0a9d939bc8.tar.gz ports-4edd64edcd3ac7bbb8629d31edcfbe0a9d939bc8.zip | |
- drop MAN8PREFIX
- preserve users and groups
Notes
Notes:
svn path=/head/; revision=351031
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/vsftpd/Makefile | 8 | ||||
| -rw-r--r-- | ftp/vsftpd/pkg-plist | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile index f47e2c6650ff..e64f9f09b939 100644 --- a/ftp/vsftpd/Makefile +++ b/ftp/vsftpd/Makefile @@ -14,8 +14,8 @@ COMMENT= A FTP daemon that aims to be "very secure" LICENSE= GPLv2 -NEED_ROOT= yes - +#USERS= ftp +#GROUPS= ftp ALL_TARGET= vsftpd USE_RC_SUBR= vsftpd DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \ @@ -89,8 +89,8 @@ do-configure: do-install: ${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}${MANPREFIX}/man/man5/ - ${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${STAGEDIR}${MANPREFIX}/man/man8/ + ${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} ${STAGEDIR}${DOCSDIR} diff --git a/ftp/vsftpd/pkg-plist b/ftp/vsftpd/pkg-plist index a7c4feb77c31..5348ea17555e 100644 --- a/ftp/vsftpd/pkg-plist +++ b/ftp/vsftpd/pkg-plist @@ -1,8 +1,8 @@ libexec/vsftpd man/man5/vsftpd.conf.5.gz man/man8/vsftpd.8.gz -@exec if ! pw usershow ftp 2>/dev/null; then pw useradd ftp -g operator -u 14 -h - -d /var/ftp -s /nonexistent -c "Anonymous Ftp"; fi -@unexec if pw usershow ftp | grep -q 14:5; then pw userdel ftp; fi +@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 |