mail-mta/opensmtpd: new stable version

Package-Manager: portage-2.3.2

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
deleted file mode 100644 (file)
index eec682c..0000000
--- a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="http://www.opensmtpd.org/"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-       MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pam +mta"
-
-DEPEND="dev-libs/openssl:0
-               sys-libs/zlib
-               pam? ( virtual/pam )
-               sys-libs/db:=
-               dev-libs/libevent
-               app-misc/ca-certificates
-               net-mail/mailbase
-               net-libs/libasr
-               !mail-mta/courier
-               !mail-mta/esmtp
-               !mail-mta/exim
-               !mail-mta/mini-qmail
-               !mail-mta/msmtp[mta]
-               !mail-mta/netqmail
-               !mail-mta/nullmailer
-               !mail-mta/postfix
-               !mail-mta/qmail-ldap
-               !mail-mta/sendmail
-               !mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-       # Use /run instead of /var/run
-       sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-       epatch_user
-       eautoreconf
-}
-
-src_configure() {
-       tc-export AR
-       AR="$(which "$AR")" econf \
-               --with-table-db \
-               --with-user-smtpd=smtpd \
-               --with-user-queue=smtpq \
-               --with-group-queue=smtpq \
-               --with-path-socket=/run \
-               --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
-               --sysconfdir=/etc/opensmtpd \
-               $(use_with pam auth-pam)
-}
-
-src_install() {
-       default
-       newinitd "${FILESDIR}"/smtpd.initd smtpd
-       systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
-       use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-       dosym /usr/sbin/smtpctl /usr/sbin/makemap
-       dosym /usr/sbin/smtpctl /usr/sbin/newaliases
-       if use mta ; then
-               dodir /usr/sbin
-               dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-               dosym /usr/sbin/smtpctl /usr/bin/sendmail
-               dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-       fi
-}
-
-pkg_preinst() {
-       enewgroup smtpd 25
-       enewuser smtpd 25 -1 /var/empty smtpd
-       enewgroup smtpq 252
-       enewuser smtpq 252 -1 /var/empty smtpq
-}
-
-pkg_postinst() {
-       einfo
-       einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
-       einfo "Redis, and many other useful addons and filters are"
-       einfo "available in the mail-filter/opensmtpd-extras package."
-       einfo
-}

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild
deleted file mode 100644 (file)
index 9999795..0000000
--- a/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="http://www.opensmtpd.org/"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-       MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl pam +mta"
-
-DEPEND="!libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
-               sys-libs/zlib
-               pam? ( virtual/pam )
-               sys-libs/db:=
-               dev-libs/libevent
-               app-misc/ca-certificates
-               net-mail/mailbase
-               net-libs/libasr
-               !mail-mta/courier
-               !mail-mta/esmtp
-               !mail-mta/exim
-               !mail-mta/mini-qmail
-               !mail-mta/msmtp[mta]
-               !mail-mta/netqmail
-               !mail-mta/nullmailer
-               !mail-mta/postfix
-               !mail-mta/qmail-ldap
-               !mail-mta/sendmail
-               !mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/_}
-
-src_prepare() {
-       # Use /run instead of /var/run
-       sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
-       epatch_user
-       eautoreconf
-}
-
-src_configure() {
-       tc-export AR
-       AR="$(which "$AR")" econf \
-               --with-table-db \
-               --with-user-smtpd=smtpd \
-               --with-user-queue=smtpq \
-               --with-group-queue=smtpq \
-               --with-path-socket=/run \
-               --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
-               --sysconfdir=/etc/opensmtpd \
-               $(use_with pam auth-pam)
-}
-
-src_install() {
-       default
-       newinitd "${FILESDIR}"/smtpd.initd smtpd
-       systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
-       use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-       dosym /usr/sbin/smtpctl /usr/sbin/makemap
-       dosym /usr/sbin/smtpctl /usr/sbin/newaliases
-       if use mta ; then
-               dodir /usr/sbin
-               dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-               dosym /usr/sbin/smtpctl /usr/bin/sendmail
-               dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-       fi
-}
-
-pkg_preinst() {
-       enewgroup smtpd 25
-       enewuser smtpd 25 -1 /var/empty smtpd
-       enewgroup smtpq 252
-       enewuser smtpq 252 -1 /var/empty smtpq
-}
-
-pkg_postinst() {
-       einfo
-       einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
-       einfo "Redis, and many other useful addons and filters are"
-       einfo "available in the mail-filter/opensmtpd-extras package."
-       einfo
-}

diff --git a/mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild
similarity index 100%
rename from mail-mta/opensmtpd/opensmtpd-5.9.2.201607021504_p1-r1.ebuild
rename to mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild

diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
index 99997957261d80c5d20beaad15de7e64c0330df4..eec682cb54591e760c1b265447b0af0fb57dffab 100644 (file)
--- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
@@ -16,11 +16,10 @@ SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl pam +mta"
+KEYWORDS="amd64 x86"
+IUSE="pam +mta"
 
-DEPEND="!libressl? ( dev-libs/openssl:0 )
-               libressl? ( dev-libs/libressl )
+DEPEND="dev-libs/openssl:0
                sys-libs/zlib
                pam? ( virtual/pam )
                sys-libs/db:=