summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <zx2c4@gentoo.org>2015-05-27 12:39:40 +0000
committerJason A. Donenfeld <zx2c4@gentoo.org>2015-05-27 12:39:40 +0000
commiteb66b775f9c322d1b0db140b580892a72a437ddf (patch)
treeceb7bcad3565abde8222fed594c30dce12c0129d
parentarm stable wrt bug #545522 (diff)
downloadgentoo-2-eb66b775f9c322d1b0db140b580892a72a437ddf.tar.gz
gentoo-2-eb66b775f9c322d1b0db140b580892a72a437ddf.tar.bz2
gentoo-2-eb66b775f9c322d1b0db140b580892a72a437ddf.zip
Version bump
(Portage version: 2.2.20/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 55758000)
-rw-r--r--mail-mta/opensmtpd/ChangeLog10
-rw-r--r--mail-mta/opensmtpd/files/opensmtpd-5.4.5_p2-libevent-version-macro.patch42
-rw-r--r--mail-mta/opensmtpd/files/opensmtpd-5.4.5_p2-setgroups-header.patch (renamed from mail-mta/opensmtpd/files/opensmtpd-5.4.4_p1-setgroups-header.patch)0
-rw-r--r--mail-mta/opensmtpd/opensmtpd-5.4.5_p2.ebuild (renamed from mail-mta/opensmtpd/opensmtpd-5.4.4_p1.ebuild)15
4 files changed, 63 insertions, 4 deletions
diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index 8a4aac80ce45..068a20fca832 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for mail-mta/opensmtpd
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.65 2015/01/08 16:17:52 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.66 2015/05/27 12:39:40 zx2c4 Exp $
+
+*opensmtpd-5.4.5_p2 (27 May 2015)
+
+ 27 May 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
+ +files/opensmtpd-5.4.5_p2-libevent-version-macro.patch,
+ +files/opensmtpd-5.4.5_p2-setgroups-header.patch, +opensmtpd-5.4.5_p2.ebuild,
+ -files/opensmtpd-5.4.4_p1-setgroups-header.patch, -opensmtpd-5.4.4_p1.ebuild:
+ Version bump
*opensmtpd-5.4.4_p1 (08 Jan 2015)
*opensmtpd-5.4.4.201501060207_p1 (08 Jan 2015)
diff --git a/mail-mta/opensmtpd/files/opensmtpd-5.4.5_p2-libevent-version-macro.patch b/mail-mta/opensmtpd/files/opensmtpd-5.4.5_p2-libevent-version-macro.patch
new file mode 100644
index 000000000000..ebd3ab4a77d3
--- /dev/null
+++ b/mail-mta/opensmtpd/files/opensmtpd-5.4.5_p2-libevent-version-macro.patch
@@ -0,0 +1,42 @@
+diff -ru opensmtpd-5.4.5p2/configure opensmtpd-5.4.5p2-fixed/configure
+--- opensmtpd-5.4.5p2/configure 2015-04-29 22:53:03.000000000 +0200
++++ opensmtpd-5.4.5p2-fixed/configure 2015-05-27 14:20:48.977763792 +0200
+@@ -19667,7 +19667,7 @@
+ if(fd == NULL)
+ exit(1);
+
+- if ((rc = fprintf(fd ,"%s\n", _EVENT_VERSION)) <0)
++ if ((rc = fprintf(fd ,"%s\n", LIBEVENT_VERSION)) <0)
+ exit(1);
+
+ exit(0);
+@@ -19794,7 +19794,7 @@
+ main ()
+ {
+
+- exit(strcmp(event_get_version(), _EVENT_VERSION) == 0 ? 0 : 1);
++ exit(strcmp(event_get_version(), LIBEVENT_VERSION) == 0 ? 0 : 1);
+
+ ;
+ return 0;
+diff -ru opensmtpd-5.4.5p2/configure.ac opensmtpd-5.4.5p2-fixed/configure.ac
+--- opensmtpd-5.4.5p2/configure.ac 2015-04-29 22:52:18.000000000 +0200
++++ opensmtpd-5.4.5p2-fixed/configure.ac 2015-05-27 14:21:00.868764207 +0200
+@@ -2697,7 +2697,7 @@
+ if(fd == NULL)
+ exit(1);
+
+- if ((rc = fprintf(fd ,"%s\n", _EVENT_VERSION)) <0)
++ if ((rc = fprintf(fd ,"%s\n", LIBEVENT_VERSION)) <0)
+ exit(1);
+
+ exit(0);
+@@ -2773,7 +2773,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ ]], [[
+- exit(strcmp(event_get_version(), _EVENT_VERSION) == 0 ? 0 : 1);
++ exit(strcmp(event_get_version(), LIBEVENT_VERSION) == 0 ? 0 : 1);
+ ]])],
+ [
+ AC_MSG_RESULT([yes])
diff --git a/mail-mta/opensmtpd/files/opensmtpd-5.4.4_p1-setgroups-header.patch b/mail-mta/opensmtpd/files/opensmtpd-5.4.5_p2-setgroups-header.patch
index 926c473636c6..926c473636c6 100644
--- a/mail-mta/opensmtpd/files/opensmtpd-5.4.4_p1-setgroups-header.patch
+++ b/mail-mta/opensmtpd/files/opensmtpd-5.4.5_p2-setgroups-header.patch
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.4_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.5_p2.ebuild
index bed15fd91447..eefbc1a3a744 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.4.4_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.4.5_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.4_p1.ebuild,v 1.1 2015/01/08 16:17:52 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.5_p2.ebuild,v 1.1 2015/05/27 12:39:40 zx2c4 Exp $
EAPI=5
@@ -17,13 +17,16 @@ 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 sqlite +mta"
+IUSE="pam ldap mysql postgres sqlite redis socketmap +mta"
DEPEND="dev-libs/openssl
sys-libs/zlib
pam? ( virtual/pam )
sys-libs/db
sqlite? ( dev-db/sqlite:3 )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql )
+ redis? ( dev-libs/hiredis )
dev-libs/libevent
app-misc/ca-certificates
net-mail/mailbase
@@ -45,7 +48,8 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P/_}
src_prepare() {
- epatch "${FILESDIR}/${PN}"-5.4.4_p1-setgroups-header.patch
+ epatch "${FILESDIR}/${P}-libevent-version-macro.patch"
+ epatch "${FILESDIR}/${P}-setgroups-header.patch"
epatch_user
eautoreconf
}
@@ -59,7 +63,12 @@ src_configure() {
--with-sock-dir=/var/run \
--sysconfdir=/etc/opensmtpd \
--with-ca-file=/etc/ssl/certs/ca-certificates.crt \
+ $(use_with ldap experimental-ldap) \
+ $(use_with mysql experimental-mysql) \
+ $(use_with postgres experimental-postgres) \
$(use_with sqlite experimental-sqlite) \
+ $(use_with redis experimental-redis) \
+ $(use_with socketmap experimental-socketmap) \
$(use_with pam)
}