From owner-svn-ports-all@FreeBSD.ORG Tue Dec 31 07:41:02 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88146EE0; Tue, 31 Dec 2013 07:41:02 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5A9F81A95; Tue, 31 Dec 2013 07:41:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBV7f204069904; Tue, 31 Dec 2013 07:41:02 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBV7f29k069902; Tue, 31 Dec 2013 07:41:02 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312310741.rBV7f29k069902@svn.freebsd.org> From: Dirk Meyer Date: Tue, 31 Dec 2013 07:41:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338258 - 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: Tue, 31 Dec 2013 07:41:02 -0000 Author: dinoex Date: Tue Dec 31 07:41:01 2013 New Revision: 338258 URL: http://svnweb.freebsd.org/changeset/ports/338258 Log: - remove user ftp on deinstall - remove deinstall/install scripts - create /var/ftp in stage PR: 185300 Deleted: head/ftp/vsftpd/pkg-deinstall head/ftp/vsftpd/pkg-install Modified: head/ftp/vsftpd/Makefile head/ftp/vsftpd/pkg-plist Modified: head/ftp/vsftpd/Makefile ============================================================================== --- head/ftp/vsftpd/Makefile Tue Dec 31 07:27:02 2013 (r338257) +++ head/ftp/vsftpd/Makefile Tue Dec 31 07:41:01 2013 (r338258) @@ -56,7 +56,7 @@ VSFTPD_NO_SSP= -e "s|-fstack-protector - .endif do-configure: -.if !defined(WITHOUT_SSL) && ${PORT_OPTIONS:MVSFTPD_SSL} +.if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL) ${REINPLACE_CMD} -e \ "s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \ -e "s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \ @@ -86,14 +86,12 @@ do-configure: @${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# listen=YES" @${ECHO_CMD} >>${WRKSRC}/vsftpd.conf "# background=YES" -pre-install: - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - 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/ + ${MKDIR} ${STAGEDIR}/var/ftp .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} -m 644 ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ Modified: head/ftp/vsftpd/pkg-plist ============================================================================== --- head/ftp/vsftpd/pkg-plist Tue Dec 31 07:27:02 2013 (r338257) +++ head/ftp/vsftpd/pkg-plist Tue Dec 31 07:41:01 2013 (r338258) @@ -1,12 +1,14 @@ libexec/vsftpd man/man5/vsftpd.conf.5.gz man/man8/vsftpd.8.gz -@exec mkdir -p %D/share/vsftpd/empty +@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 @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 -@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi @unexec rmdir /var/ftp 2>/dev/null || true +@exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi +@exec mkdir -p %D/share/vsftpd/empty @dirrm share/vsftpd/empty @dirrm share/vsftpd %%PORTDOCS%%%%DOCSDIR%%/AUDIT