commit: fd7220df54681503ff6937d8e7408def752cbc69
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 17:45:15 2016 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 17:47:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7220df
Version bump
Package-Manager: portage-2.3.0_rc1
mail-mta/opensmtpd/Manifest | 1 +
...7.3_p2-r2.ebuild => opensmtpd-5.9.2_p1-r1.ebuild} | 16 +++++++---------
...tpd-5.7.3_p2.ebuild => opensmtpd-5.9.2_p1.ebuild} | 20 +++++++++-----------
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 402b521..29b0229 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1 +1,2 @@
DIST opensmtpd-5.7.3p2.tar.gz 709074 SHA256
0d2973008d0f66bebb84bed516be6c32617735241cc54dd26643529281a8e52b SHA512
bac0b8d6a6969a5e49a1d45b2c74cb2f3da44d06b12c7162500adf3ca312751020762bc8301075a9d7634d94cf51f978d04fac327f843680646e9e687737c42f
WHIRLPOOL
7c82fe76f9185472781b24332b6c7acd3b062e1bb6e426e122e1d2b2caf90e33a46770d6504fb7a3b32d50c9e31aa7284d2e47968e43d706b590936223f03dc6
+DIST opensmtpd-5.9.2p1.tar.gz 681855 SHA256
3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d SHA512
99ca15101557848aa6d642f0c0171b152d805192e6839a97410b19431c981a21a5c0dc011e2c8cd91f3e6f6acb37a77f0f4c8e68114bf9808240392fe2b5d375
WHIRLPOOL
4d50474eb9f845633d152c065a0e70f3d41fba97134b33d3eb5164d39bdc58eeb4133b2f951a1815143a468144fb631f5f0b2960f57e7ba18a65321413fb5b6f
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.3_p2-r2.ebuild
b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
similarity index 87%
rename from mail-mta/opensmtpd/opensmtpd-5.7.3_p2-r2.ebuild
rename to mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
index dc90b46..f4f32a6 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.7.3_p2-r2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1-r1.ebuild
@@ -47,8 +47,6 @@ 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
- use libressl && epatch
"${FILESDIR}/${PN}-5.7.3p2-libressl-arc4random-circularity.patch"
-
epatch_user
eautoreconf
}
@@ -56,14 +54,14 @@ src_prepare() {
src_configure() {
tc-export AR
AR="$(which "$AR")" econf \
- --enable-table-db \
- --with-privsep-user=smtpd \
- --with-queue-user=smtpq \
- --with-privsep-path=/var/empty \
- --with-sock-dir=/run \
+ --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 \
- --with-ca-file=/etc/ssl/certs/ca-certificates.crt \
- $(use_with pam)
+ $(use_with pam auth-pam)
}
src_install() {
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.3_p2.ebuild
b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1.ebuild
similarity index 86%
rename from mail-mta/opensmtpd/opensmtpd-5.7.3_p2.ebuild
rename to mail-mta/opensmtpd/opensmtpd-5.9.2_p1.ebuild
index fe35e0f..c55d90f 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.7.3_p2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.9.2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,8 +19,7 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="pam +mta"
-DEPEND="dev-libs/openssl:0
- sys-libs/zlib
+DEPEND="sys-libs/zlib
pam? ( virtual/pam )
sys-libs/db:=
dev-libs/libevent
@@ -46,7 +45,6 @@ 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
}
@@ -54,14 +52,14 @@ src_prepare() {
src_configure() {
tc-export AR
AR="$(which "$AR")" econf \
- --enable-table-db \
- --with-privsep-user=smtpd \
- --with-queue-user=smtpq \
- --with-privsep-path=/var/empty \
- --with-sock-dir=/run \
+ --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 \
- --with-ca-file=/etc/ssl/certs/ca-certificates.crt \
- $(use_with pam)
+ $(use_with pam auth-pam)
}
src_install() {
