From owner-svn-ports-head@freebsd.org Sun Sep 10 16:53:58 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 4117EE1AFF3; Sun, 10 Sep 2017 16:53:58 +0000 (UTC) (envelope-from mandree@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 0DF507E74C; Sun, 10 Sep 2017 16:53:57 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8AGrvgi010400; Sun, 10 Sep 2017 16:53:57 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8AGruBm010398; Sun, 10 Sep 2017 16:53:56 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201709101653.v8AGruBm010398@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 10 Sep 2017 16:53:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449582 - in head/mail/mailman: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/mail/mailman: . files X-SVN-Commit-Revision: 449582 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: Sun, 10 Sep 2017 16:53:58 -0000 Author: mandree Date: Sun Sep 10 16:53:56 2017 New Revision: 449582 URL: https://svnweb.freebsd.org/changeset/ports/449582 Log: Fix up DEFAULT_URL_HOST/DEFAULT_MAIL_HOST for jailed or external builds. If the package is built in, for instance, poudriere, or on a computer other than the one it is later installed on, the DEFAULT_MAIL_HOST and DEFAULT_URL_HOST variables in the Mailman/Defaults.py file were unsuitable. Leverage pkg-install to fix these up to be the same as hostname -f at install time. [The MFH would require the intermediate update to 2.1.24 to be included.] MFH: 2017Q3 Modified: head/mail/mailman/Makefile head/mail/mailman/files/pkg-install.in Modified: head/mail/mailman/Makefile ============================================================================== --- head/mail/mailman/Makefile Sun Sep 10 16:49:46 2017 (r449581) +++ head/mail/mailman/Makefile Sun Sep 10 16:53:56 2017 (r449582) @@ -3,6 +3,7 @@ PORTNAME= mailman DISTVERSION= 2.1.24 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ @@ -34,7 +35,9 @@ CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} \ --with-username=${MM_USERNAME} \ --with-groupname=${MM_GROUPNAME} \ --with-mail-gid=${MAIL_GID} --with-cgi-gid=${CGI_GID} \ - --with-permcheck=no + --with-permcheck=no \ + --with-mailhost=// \ + --with-urlhost=// # The Mailman port supports a number of variables that may be tweaked at # build time. Getting the values of some of them right is crucial! Modified: head/mail/mailman/files/pkg-install.in ============================================================================== --- head/mail/mailman/files/pkg-install.in Sun Sep 10 16:49:46 2017 (r449581) +++ head/mail/mailman/files/pkg-install.in Sun Sep 10 16:53:56 2017 (r449582) @@ -106,6 +106,9 @@ POST-INSTALL) echo "---> rcfile sets mailman_fix_perms to no, skipping check_perms" fi + echo "---> Fixing up default host names (MAILHOST, URLHOST)" + sed -Ee "s}^(DEFAULT_(EMAIL|URL)_HOST) = '//'}\1 = '`hostname -f`'}" -i '' "%%MAILMANDIR%%/Mailman/Defaults.py" + echo "---> Running assorted other checks" if egrep -q "^[ \t]*MTA.*=.*Postfix" "%%MAILMANDIR%%/Mailman/mm_cfg.py" ; then # run Postfix-specific checks