From owner-svn-ports-all@FreeBSD.ORG Fri Apr 11 18:56:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DAD9ACA; Fri, 11 Apr 2014 18:56:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4008B110A; Fri, 11 Apr 2014 18:56:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3BIuHS5092610; Fri, 11 Apr 2014 18:56:17 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3BIuGtj092608; Fri, 11 Apr 2014 18:56:16 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201404111856.s3BIuGtj092608@svn.freebsd.org> From: Dirk Meyer Date: Fri, 11 Apr 2014 18:56:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351031 - head/ftp/vsftpd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2014 18:56:17 -0000 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