From owner-svn-ports-all@FreeBSD.ORG Tue Sep 30 15:04:04 2014 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85197B92; Tue, 30 Sep 2014 15:04:04 +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 70C9B967; Tue, 30 Sep 2014 15:04:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UF444T040792; Tue, 30 Sep 2014 15:04:04 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UF43HZ040784; Tue, 30 Sep 2014 15:04:03 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201409301504.s8UF43HZ040784@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 30 Sep 2014 15:04:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369614 - in head: . mail/maildrop 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: Tue, 30 Sep 2014 15:04:04 -0000 Author: madpilot Date: Tue Sep 30 15:04:03 2014 New Revision: 369614 URL: http://svnweb.freebsd.org/changeset/ports/369614 QAT: https://qat.redports.org/buildarchive/r369614/ Log: - Modify comment and add UPDATING entry to explain that MAILDROP_SUID and MAILDROP_SGID now need to be existing usernames on the destination system. numeric UIDs and GIDs, or non existent usernames, will cause a broken installation since pkgng will skip on the entries of files owned by unknown users. [1] - Fix MGID and MUID PLIST_SUB variables not being set when only one of the two above variables is deifined, again generating a broken package. [2] - While here, remove dirrm. Reported by: Lukas Maly [1] Reported by: itetcu@ [1] [2] Modified: head/UPDATING head/mail/maildrop/Makefile head/mail/maildrop/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Sep 30 14:51:12 2014 (r369613) +++ head/UPDATING Tue Sep 30 15:04:03 2014 (r369614) @@ -6,6 +6,21 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20140930: + AFFECTS: users of mail/maildrop + AUTHOR: madpilot@FreeBSD.org + + Due to the way pkg works please note that the configuration + variables MAILDROP_SUID and MAILDROP_SGID, despite keeping their + old names, are now required to contain a valid username and + groupname existing on the system in which the package will be + installed, while in the past numeric uids and gids worked fine. + + Wrong values will cause pkg to skip installing the setuid binaries + on the system. + + Please check your configuration. + +20140930: AFFECTS: users of finance/gnucash AUTHOR: madpilot@FreeBSD.org Modified: head/mail/maildrop/Makefile ============================================================================== --- head/mail/maildrop/Makefile Tue Sep 30 14:51:12 2014 (r369613) +++ head/mail/maildrop/Makefile Tue Sep 30 15:04:03 2014 (r369614) @@ -3,14 +3,20 @@ # You can define the following to enable further compile time # customizations: -# MAILDROP_SUID=, -# MAILDROP_SGID= Maildrop will be installed with suid permissions for -# MAILDROP_SUID, and sgid permissions for MAILDROP_SGID. +# MAILDROP_SUID=, +# MAILDROP_SGID= Maildrop will be installed with suid +# permissions for MAILDROP_SUID, and sgid +# permissions for MAILDROP_SGID. +# NOTE: must be a valid username/groupname +# at installation time, numeric uids/gids +# and non existing users will cause the +# installed package to miss files. # MAILDROP_TRUSTED_USERS= Specify users allowed to use the -d option # MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72 PORTNAME= maildrop PORTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} @@ -78,10 +84,10 @@ CONFIGURE_ARGS+= --enable-maildrop-uid=" PLIST_SUB+= MMODE='6755' MUID='${MAILDROP_SUID}' MGID='${MAILDROP_SGID}' .elif defined(MAILDROP_SUID) CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}" -PLIST_SUB+= MMODE='4755' MUID='${MAILDROP_SUID}' +PLIST_SUB+= MMODE='4755' MUID='${MAILDROP_SUID}' MGID='mail' .elif defined(MAILDROP_SGID) CONFIGURE_ARGS+= --enable-maildrop-gid="${MAILDROP_SGID}" -PLIST_SUB+= MMODE='2755' MGID='${MAILDROP_SGID}' +PLIST_SUB+= MMODE='2755' MGID='${MAILDROP_SGID}' MUID='root' .else PLIST_SUB+= MMODE='' MUID='root' MGID='mail' .endif Modified: head/mail/maildrop/pkg-plist ============================================================================== --- head/mail/maildrop/pkg-plist Tue Sep 30 14:51:12 2014 (r369613) +++ head/mail/maildrop/pkg-plist Tue Sep 30 15:04:03 2014 (r369614) @@ -63,4 +63,3 @@ man/man8/maildrop-deliverquota.8.gz %%PORTDOCS%%%%DOCSDIR%%/reformime.html %%PORTDOCS%%%%DOCSDIR%%/rfc2045.html %%PORTDOCS%%%%DOCSDIR%%/rfc822.html -%%PORTDOCS%%@dirrm %%DOCSDIR%%