Date: Fri, 11 Apr 2014 18:56:16 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351031 - head/ftp/vsftpd Message-ID: <201404111856.s3BIuGtj092608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Fri Apr 11 18:56:16 2014 New Revision: 351031 URL: http://svnweb.freebsd.org/changeset/ports/351031 QAT: https://qat.redports.org/buildarchive/r351031/ Log: - drop MAN8PREFIX - preserve users and groups Modified: head/ftp/vsftpd/Makefile head/ftp/vsftpd/pkg-plist Modified: head/ftp/vsftpd/Makefile ============================================================================== --- head/ftp/vsftpd/Makefile Fri Apr 11 18:51:04 2014 (r351030) +++ head/ftp/vsftpd/Makefile Fri Apr 11 18:56:16 2014 (r351031) @@ -14,8 +14,8 @@ COMMENT= A FTP daemon that aims to be "v 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} Modified: head/ftp/vsftpd/pkg-plist ============================================================================== --- head/ftp/vsftpd/pkg-plist Fri Apr 11 18:51:04 2014 (r351030) +++ head/ftp/vsftpd/pkg-plist Fri Apr 11 18:56:16 2014 (r351031) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404111856.s3BIuGtj092608>