From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1C26E59CA3 for ; Mon, 7 Mar 2016 21:40:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9141B21C01E; Mon, 7 Mar 2016 21:40:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2F0721C01E for ; Mon, 7 Mar 2016 21:40:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 482AA340A9C for ; Mon, 7 Mar 2016 21:40:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2428A1B8A for ; Mon, 7 Mar 2016 21:40:34 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1457386746.fd0c3a3111e0809008e02050368fd10980a53140.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/nullmailer/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-mta/nullmailer/asd mail-mta/nullmailer/nullmailer-2.0.ebuild X-VCS-Directories: mail-mta/nullmailer/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: fd0c3a3111e0809008e02050368fd10980a53140 X-VCS-Branch: master Date: Mon, 7 Mar 2016 21:40:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a2cdec5e-2448-420e-8794-9317f1e30713 X-Archives-Hash: ca9e34243d107e6f81aaf01180ee1a29 commit: fd0c3a3111e0809008e02050368fd10980a53140 Author: Mike Frysinger gentoo org> AuthorDate: Mon Mar 7 21:39:06 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Mar 7 21:39:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0c3a31 mail-mta/nullmailer: style cleanups -- no functional changes mail-mta/nullmailer/asd | 123 ------------------------------ mail-mta/nullmailer/nullmailer-2.0.ebuild | 4 +- 2 files changed, 2 insertions(+), 125 deletions(-) diff --git a/mail-mta/nullmailer/asd b/mail-mta/nullmailer/asd deleted file mode 100644 index c461dea..0000000 --- a/mail-mta/nullmailer/asd +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools eutils flag-o-matic multilib systemd user - -DESCRIPTION="Simple relay-only local mail transport agent" -HOMEPAGE="http://untroubled.org/nullmailer/" -SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="ssl" - -DEPEND=" - sys-apps/groff - ssl? ( net-libs/gnutls )" -RDEPEND=" - virtual/logger - virtual/shadow - ssl? ( net-libs/gnutls ) - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp - !mail-mta/netqmail - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/opensmtpd - !mail-mta/ssmtp" - -pkg_setup() { - enewgroup nullmail 88 - enewuser nullmail 88 -1 /var/spool/nullmailer nullmail -} - -src_prepare() { - sed -e "s#/usr/local/etc#/etc#" -e "s#/usr/local/libexec#/usr/libexec#" -i doc/nullmailer-send.8 -} - -src_configure() { - econf \ - --localstatedir=/var \ - $(use_enable ssl tls) -} - -src_install () { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO doc/DIAGRAM - - # A small bit of sample config - insinto /etc/nullmailer - newins "${FILESDIR}"/remotes.sample-1.13 remotes - - # This contains passwords, so should be secure - fperms 0640 /etc/nullmailer/remotes - fowners root:nullmail /etc/nullmailer/remotes - - # daemontools stuff - dodir /var/spool/nullmailer/service{,/log} - - insinto /var/spool/nullmailer/service - newins scripts/nullmailer.run run - fperms 700 /var/spool/nullmailer/service/run - - insinto /var/spool/nullmailer/service/log - newins scripts/nullmailer-log.run run - fperms 700 /var/spool/nullmailer/service/log/run - - # usability - dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail - - # permissions stuff - keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} - fperms 770 /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} - fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq - fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq - - newinitd "${FILESDIR}"/init.d-nullmailer-r4 nullmailer - systemd_dounit scripts/${PN}.service -} - -pkg_postinst() { - if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then - mkfifo "${ROOT}"/var/spool/nullmailer/trigger - fi - chown nullmail:nullmail \ - "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die - chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue} || die - chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die - - # This contains passwords, so should be secure - chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die - chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "To create an initial setup, please do:" - elog "emerge --config =${CATEGORY}/${PF}" - fi -} - -pkg_postrm() { - if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then - rm "${ROOT}"/var/spool/nullmailer/trigger || die - fi -} - -pkg_config() { - if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then - einfo "Setting /etc/nullmailer/me" - /bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me - fi - if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then - einfo "Setting /etc/nullmailer/defaultdomain" - /bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain - fi -} diff --git a/mail-mta/nullmailer/nullmailer-2.0.ebuild b/mail-mta/nullmailer/nullmailer-2.0.ebuild index 1c3e959..859c4b3 100644 --- a/mail-mta/nullmailer/nullmailer-2.0.ebuild +++ b/mail-mta/nullmailer/nullmailer-2.0.ebuild @@ -10,8 +10,8 @@ DESCRIPTION="Simple relay-only local mail transport agent" HOMEPAGE="http://untroubled.org/nullmailer/" SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="ssl" @@ -61,7 +61,7 @@ src_configure() { $(use_enable ssl tls) } -src_install () { +src_install() { default # A small bit of sample config