From owner-svn-ports-all@FreeBSD.ORG Wed Sep 24 20:09:50 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 E93F7B50; Wed, 24 Sep 2014 20:09:50 +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 C82FD607; Wed, 24 Sep 2014 20:09:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8OK9own072566; Wed, 24 Sep 2014 20:09:50 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8OK9o5L072560; Wed, 24 Sep 2014 20:09:50 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409242009.s8OK9o5L072560@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 24 Sep 2014 20:09:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369203 - in head: . mail/pop3vscan 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.18-1 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: Wed, 24 Sep 2014 20:09:51 -0000 Author: antoine Date: Wed Sep 24 20:09:49 2014 New Revision: 369203 URL: http://svnweb.freebsd.org/changeset/ports/369203 QAT: https://qat.redports.org/buildarchive/r369203/ Log: Use the ports framework to create pop3vscan user Modified: head/UIDs head/mail/pop3vscan/Makefile head/mail/pop3vscan/pkg-install Modified: head/UIDs ============================================================================== --- head/UIDs Wed Sep 24 20:08:16 2014 (r369202) +++ head/UIDs Wed Sep 24 20:09:49 2014 (r369203) @@ -93,6 +93,7 @@ kdm:*:147:147::0:0:KDE Display Manager:/ ipv6mon:*:148:148::0:0:IPv6 Address Monitoring Daemon:/nonexistent:/usr/sbin/nologin avenger:*:149:149::0:0:Mail Avenger:/var/spool/avenger:/usr/sbin/nologin cbsd:*:150:150::0:0:Cbsd user:/nonexistent:/bin/sh +pop3vscan:*:151:6::0:0:POP3VScan Daemon:/var/spool/pop3vscan:/usr/sbin/nologin rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin trircd:*:154:154::0:0:& user:/usr/local/etc/tr-ircd:/usr/sbin/nologin monetdb:*:156:156::0:0:MonetDB user:/usr/local/monetdb5:/bin/sh Modified: head/mail/pop3vscan/Makefile ============================================================================== --- head/mail/pop3vscan/Makefile Wed Sep 24 20:08:16 2014 (r369202) +++ head/mail/pop3vscan/Makefile Wed Sep 24 20:09:49 2014 (r369203) @@ -15,7 +15,8 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve USES= gmake USE_GCC= yes MAKE_ENV= _LDFLAGS="${LDFLAGS}" -SCRIPTS_ENV= PKG_PREFIX=${PREFIX} NONEXISTENT=${NONEXISTENT} PASSWD=/etc/passwd STAGEDIR=${STAGEDIR} + +USERS= pop3vscan PLIST_FILES= etc/pop3vscan.conf.sample \ etc/pop3vscan.mail.sample \ @@ -41,7 +42,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pop3vscan.mail ${STAGEDIR}${PREFIX}/etc/pop3vscan.mail.sample ${INSTALL_SCRIPT} ${FILESDIR}/pop3vscan.sh ${STAGEDIR}${PREFIX}/etc/rc.d/ -post-install: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include Modified: head/mail/pop3vscan/pkg-install ============================================================================== --- head/mail/pop3vscan/pkg-install Wed Sep 24 20:08:16 2014 (r369202) +++ head/mail/pop3vscan/pkg-install Wed Sep 24 20:09:49 2014 (r369203) @@ -1,124 +1,11 @@ #!/bin/sh -chmods_done=" " - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -make_account() { - local u g gcos homeopt home - - u=$1 - g=$2 - gcos=$3 - homeopt=${4:+"-d $4"} - - if pw group show "${g}" >/dev/null 2>&1; then - echo "You already have a group \"${g}\", so I will use it." - else - echo "You need a group \"${g}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd ${g} || exit - echo "Done." - else - echo "Please create it, and try again." - if ! grep -q "^${u}:" ${PASSWD}; then - echo "While you're at it, please create a user \"${u}\" too," - echo "with a default group of \"${g}\"." - fi - exit 1 - fi - fi - - if pw user show "${u}" >/dev/null 2>&1; then - echo "You already have a user \"${u}\", so I will use it." - else - echo "You need a user \"${u}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw useradd ${u} -g ${g} -h - ${homeopt} \ - -s ${NONEXISTENT} -c "${gcos}" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi - fi - - if [ x"$homeopt" = x ]; then - eval home=~${u} - if [ ! -d "${home}" ]; then - if yesno \ - "Would you like me to create ${u}'s home directory (${home})" y - then - (umask 77 && \ - mkdir -p ${home}) || exit - chown -R ${u}:${g} ${home} || exit - else - echo "Please create it, and try again." - exit 1 - fi - fi - fi -} - case $2 in POST-INSTALL) - if which -s pw && which -s lockf; then - : - else - cat <