From owner-svn-ports-head@freebsd.org Mon Jul 3 17:37:57 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C4D49EBAC2; Mon, 3 Jul 2017 17:37:57 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2648078D75; Mon, 3 Jul 2017 17:37:57 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v63Hbu0K016559; Mon, 3 Jul 2017 17:37:56 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v63HbuBl016556; Mon, 3 Jul 2017 17:37:56 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201707031737.v63HbuBl016556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Mon, 3 Jul 2017 17:37:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444972 - in head/mail/dcc-dccd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: in head/mail/dcc-dccd: . files X-SVN-Commit-Revision: 444972 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2017 17:37:57 -0000 Author: ultima Date: Mon Jul 3 17:37:55 2017 New Revision: 444972 URL: https://svnweb.freebsd.org/changeset/ports/444972 Log: * Fix permissions from regression on r443717 PR: 220201 Submitted by: Piotr Kubaj (maintainer) Reviewed by: lifanov (mentor), matthew (mentor) Approved by: lifanov (mentor) Differential Revision: https://reviews.freebsd.org/D11347 Modified: head/mail/dcc-dccd/Makefile head/mail/dcc-dccd/files/pkg-install.in head/mail/dcc-dccd/pkg-plist Modified: head/mail/dcc-dccd/Makefile ============================================================================== --- head/mail/dcc-dccd/Makefile Mon Jul 3 17:35:16 2017 (r444971) +++ head/mail/dcc-dccd/Makefile Mon Jul 3 17:37:55 2017 (r444972) @@ -3,7 +3,7 @@ PORTNAME= dcc-dccd PORTVERSION= 1.3.159 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.dcc-servers.net/dcc/source/old/ \ ftp://ftp.dcc-servers.net/src/dcc/old/ \ @@ -48,7 +48,7 @@ DCCHOME= ${PREFIX}/dcc PLIST_SUB+= DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}" SUB_FILES= pkg-install pkg-message -SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME} +SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME} DCCUSER="${DCCUSER}" ## Use the configure script to explicitly set the locations of all files, ## in case the standard locations have been locally overridden @@ -107,24 +107,24 @@ post-install: ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample .for sf in bin/dccproc bin/cdcc dcc/libexec/dccsight dcc/libexec/check_ip_range \ dcc/libexec/wlist dcc/libexec/ck2ip - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf} .endfor .if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM} - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/dcc/libexec/dns-helper + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dns-helper .endif post-install-DCCIFD-on: .for sf in bin/dccif-test dcc/libexec/dccifd - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf} .endfor post-install-DCCD-on: .for sf in dcc/libexec/dump-clients dcc/libexec/dbclean \ dcc/libexec/dblist dcc/libexec/dccd - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/${sf} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf} .endfor post-install-DCCM-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/dcc/libexec/dccm + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dccm .include Modified: head/mail/dcc-dccd/files/pkg-install.in ============================================================================== --- head/mail/dcc-dccd/files/pkg-install.in Mon Jul 3 17:35:16 2017 (r444971) +++ head/mail/dcc-dccd/files/pkg-install.in Mon Jul 3 17:37:55 2017 (r444972) @@ -2,24 +2,20 @@ # $FreeBSD: /tmp/pcvs/ports/mail/dcc-dccd/files/pkg-install.in,v 1.2 2011-07-04 19:39:45 crees Exp $ PREFIX=${PKG_PREFIX:-%%PREFIX%%} - DCCHOME=%%DCCHOME%% +DCCUSER=%%DCCUSER%% if [ "$2" = "POST-INSTALL" ]; then - echo "=> Generating unique passwords for your DCC install..." - echo "=>" - echo "=> Note this will make map.sample, map.txt.sample and" - echo "=> ids.sample fail their MD5 checks on package removal." - /bin/sh $PREFIX/dcc/libexec/fix-map \ - -n .sample \ - -I $DCCHOME/ids.sample -i $DCCHOME/ids \ - -T $DCCHOME/map.txt.sample -t $DCCHOME/map.txt \ + -n .nopasswd \ + -I $DCCHOME/ids.nopasswd -i $DCCHOME/ids \ + -T $DCCHOME/map.txt.nopasswd -t $DCCHOME/map.txt \ -m $DCCHOME/map for file in ids map map.txt ; do - /bin/cp -p $DCCHOME/$file $DCCHOME/${file}.sample + /bin/cp -p $DCCHOME/$file $DCCHOME/${file}.nopasswd + /usr/sbin/chown $DCCUSER $DCCHOME/${file} $DCCHOME/${file}.nopasswd done fi Modified: head/mail/dcc-dccd/pkg-plist ============================================================================== --- head/mail/dcc-dccd/pkg-plist Mon Jul 3 17:35:16 2017 (r444971) +++ head/mail/dcc-dccd/pkg-plist Mon Jul 3 17:37:55 2017 (r444972) @@ -76,6 +76,4 @@ man/man8/dccsight.8.gz %%DCCGREY%%@unexec [ -e %D/dcc/grey_flod.map ] && rm -f %D/dcc/grey_flod.map || true %%DCCGREY%%@unexec [ -e %D/dcc/grey_clients ] && rm -f %D/dcc/grey_clients || true @dir dcc/log -@group wheel -@owner root @dir dcc