Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x55758000

5 files changed, 81 insertions, 21 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/Manifest b/mail-mta/opensmtpd/Manifest
index 0a9acc042bd3..13f378d1ca37 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,31 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX opensmtpd-5.4.4_p1-setgroups-header.patch 733 SHA256 3504a8cb835ea79c0bf4e3d329677269f9eb0fe644a2e38d2e804dc8ec4fe1f1 SHA512 9ca0acc6e9103184e22db5efc0f6b200027468c545639f0a03b215696464663e5135f4da313b1e6af8e88cca96238e3bd5eda0ab4130ab537b31ced76038848e WHIRLPOOL 5b3dcff71b8deedd3842de15a7322448705d8d24355f300ede0f5717a5cc9a49815d5d6794226343b36b5c346c12c3718695b233e754b32d8de9beddb81ea703
+AUX opensmtpd-5.4.5_p2-libevent-version-macro.patch 1247 SHA256 1a779a436e23c35253086f8e1277f089f11ede433c6f22b3e90f5fdbb107dd45 SHA512 6b906c484ec9ae8821ab8fc1e67bef19e09308cf46baf9c79bb717dc6ff871d467e328bd0e7b6dd9920f2ce44c8e70e4ed3f98c5d5cde7cf7b138d6bb03ee8bd WHIRLPOOL 5502a7d3c062dbfddd718d566e85d7bfd28be7b6f6c0aafa003923a194104b0a220ad7f6a4a22f9bf771c96c6bec1ecfccf6c8a92c28f87d1879d0c1975992d0
+AUX opensmtpd-5.4.5_p2-setgroups-header.patch 733 SHA256 3504a8cb835ea79c0bf4e3d329677269f9eb0fe644a2e38d2e804dc8ec4fe1f1 SHA512 9ca0acc6e9103184e22db5efc0f6b200027468c545639f0a03b215696464663e5135f4da313b1e6af8e88cca96238e3bd5eda0ab4130ab537b31ced76038848e WHIRLPOOL 5b3dcff71b8deedd3842de15a7322448705d8d24355f300ede0f5717a5cc9a49815d5d6794226343b36b5c346c12c3718695b233e754b32d8de9beddb81ea703
 AUX smtpd.initd 428 SHA256 ba340a264ed98642b3783cbbfd6f49c3a06878afbd0856163782fc6bdeae3ff9 SHA512 46010ff4b87b1891f842ef9dc52c38730de9fbb7f2d0ace99b8c58737d353fab5f570b53f69da838f6ddfe9db88145d4c6d3a257e1590ef6ae026cfff6a054e3 WHIRLPOOL 3ce205433bc62d36d8ee850852752e5cfe2aaafe2367d200d4fab2099d60b0db9af64199c8f46139485d52c09a4981860e5a053e6d7ab4a55a84feb49a8331ed
 AUX smtpd.pam 147 SHA256 d8edae7ceb5f5574426127aaa16fa00985f070065407b9de03e1963e9f7aaa58 SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086 WHIRLPOOL cb84894bb7c0f8348ad895568dd65864b15190f8f915f4501c0dd8c595fc32cd3430e5616e93286880f61d35b2c3120c731d1d091e69d77e92aeaed8817c169d
 AUX smtpd.service 138 SHA256 928e59e45324677ca44420dd27ce334ba607d78fce1ddd9617b1eeafd9e105af SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258 WHIRLPOOL ae4d4a67bf038e8af1b4f44f81add190599f775356fc0de1bbfb61a63a41be28b68d8922463d47b61b0a3b4cab2883b867f93137b23ea9fa7e5efbce78d432ad
 AUX smtpd.socket 114 SHA256 0d4e598dcee849b9baf9a35f42c91e49545ffd611cfa425958d159ca3b482785 SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2 WHIRLPOOL c42d22ef8b6793bdef82e9ac39977e6269676c420c3d2b014426b469bf25f81070023ad62f2d1efaa9e6fa91035e7023cabfca585e10e3ef953671620aa87231
 DIST opensmtpd-201501060207p1.tar.gz 761278 SHA256 a99c3bd695c494ac5253ffbafc1351203d44cf1a51d05b59d1b8379a94682bea SHA512 70181e7e400cd5c7f3850b17ff496cf2631e37cc18d7ceb78fc7c1d4972f43ff9b412d00e2dac65a9b822110b09d39cc747a60eee25b9e85b3b59fec8c2119ed WHIRLPOOL 0d5220af6fb49bc1c9b0d72346b4b08e3c7fa81e0991e3077857d4f9dcc0a2bb5cc3ea3909a7e043697c9843ca83d8a1ccfbf6c636e4aba7305b86b718c77db4
-DIST opensmtpd-5.4.4p1.tar.gz 798968 SHA256 1118330aa54e9a8a30914a1f2e129a83f2954a5956300eade522a1396f6d8ebd SHA512 b439e26b322bd7bee63be344403dd47b0e8dbd37119ec97d23dfe4b8f72eb34d9b65a595c5f87482089ce222449a21eb0b5e1840925cdd7ec11856e531b1e2cb WHIRLPOOL 13a0c770a052786aaabf6d04c46432db9e3778a0bd903ce6e2be78359d73a6e320e047c0a46a274eed477384b4e09f1c185cea9ca8e9a8f85da76ec1b223ae5e
+DIST opensmtpd-5.4.5p2.tar.gz 798731 SHA256 c7574b0d673d3f1dfec49694d6421ad8f08fa037d7dde96a73dc892289a538ee SHA512 de22b53b97f02fb831162c6ea470d39880b141c59ecbae102392e9d277fddbcb72918c3b87aece07bed80bc41dfbe56ff242ae99bf6a6b2dc324ac6d233d9bc6 WHIRLPOOL 47e42b67b87fea1471089e5d4c664895e3b4f62fcc0e1b1c55ec63a27c93d5b7b7576b9bf632833abe85ea65f685f6ca26a4cabf128ec97008461a990117430c
 EBUILD opensmtpd-5.4.4.201501060207_p1.ebuild 2119 SHA256 e04fd6263362babfdb61345cd3306240f68b96d348d4f009c879ef17d70e5c56 SHA512 bde0323fc2c731e33b4ba7ae6181a538c67ac5d6c4cf24fada4915fa82f8982b6790c2c0cce6f49bc5a8f998ba53731c13b1df1f32d3762eb8779f8d66d72251 WHIRLPOOL a740e94d3db189f964c4deea49f10fbc29d4f6a86868908a7e530b50b074fcd7dccb65a77b4113756edc0254f5e325d7ffc2baa33b17d32c6776aab3a8a0cf0a
-EBUILD opensmtpd-5.4.4_p1.ebuild 2104 SHA256 98f2d4f825e31284893ac2a0681697375f55fb91164c365c9725f6c83d0c662d SHA512 384179de33f20799b436daf7f863ec83c959d84bab7517da08abbbe3377d0712540309970cab3faae3c1d4cbe23ef49ef282c3817beb28a181e917707fb340c0 WHIRLPOOL ccd3cdb35572e4463b0c9403f9705a61002d1c009f4265e3dea140bc021618e4adaf99b039ad7cc4e63cff9b2c9ada7daa3c1d642422a3296cacb815b3e44355
-MISC ChangeLog 13107 SHA256 3b3dd4ae16dce8d71f8081108bd9c0e423b2dc15be2410dfe33768049efe7366 SHA512 a6eef715ee90c2ed333f7fdcaf2b665d80f868dd5ee6672b8ca10215d1a9b2139a056c2a9da491f84074c0349cf3edfb1c83285b89bb72f9b3e8e4305567a3c0 WHIRLPOOL cb94029e90938eacfb6ea405a161421d3361a4f67fc9de73297f70e03a8f1f8237424c4c3d77e28c06f9bf4750ca736a3288f2527f8cef1909ea8c4485e287f3
+EBUILD opensmtpd-5.4.5_p2.ebuild 2494 SHA256 5b72ba300ba7d9a2f6321c297310c792a723e50b96b2ffab795dc396a301b93e SHA512 ac777c295486ddf42ee20fd16be8420181ec3a0720eb636f6518dbc78ed76426c9220b62969de20542f128eab0513f14129253c2f424ebb64f26217cbb7d89f9 WHIRLPOOL d72cb3b53ed7b0879c101b9e452e244fbeb317388e0ead61b71cefc64c594123b361f7f6d74e61c70ed005ffaef664ad2a4575355247ba07dc150d1e003b9ff8
+MISC ChangeLog 13429 SHA256 4c73d5cf1624a498c17bb56ca9cbe36bfdfdaad99cbf8f1430f92258f1bd4206 SHA512 00abe74ea1c130f3fb35dcd65839d76fd3e2e54abddc534acbf0b2649d3c67d8eac832c4954c4a85e0ac7afc1645247965d33fd6b0dafbb768461c42d080c678 WHIRLPOOL 31d0141ad30c6690d282c2afe081d7edf1ae67b7dd05602c3edff8bab3a8bd744c5541c1ee09b0e72fc2b179958c45617694813ff816bdd6d0db69ac0f044747
 MISC metadata.xml 582 SHA256 c5c363648f6fecb0bccaae7b9202c2ec10c2413732300cfac851bf359945a40c SHA512 86d6970f9bc766f4c0da6d5bc3fc7c0df22620507c536b202e08c2ae753874e11ba386a3b366f1e1208e035ce6052f13cfa8ec07e0b61785f2c673929720b91b WHIRLPOOL 6547028efe39bd177e36b67e58802e320a16e3f96dffcb5be6dce4e4137ef24a7da53e0c49fdd7f396fa0ce9ff7c2981943bea02a024d6cbecb261a038d82375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUrq2yAAoJEEn8cBKl3gOu2cEP/2sgXQ+v1v0LI8jEz/jDduzS
-v6y+Mx1sks7ocLzQf4z0n7KsnL8PmdF5AQtwHehFntFwSFTZpvK+E4AqcQC3F2rR
-ZWX9lsvZ5y7d1sT4n5MHVqSgY2MTJ1MH77b1hcDugFPiOYWB0476JAuyRQ/NGw+i
-ToPV5si+E1uobeCvvbee7KfSCo9+OdDDv8sGgtpS6kMj376Ei47U+385aKIQPpix
-OHwgy5xev+0I7DSGstYshxmjKCl9tTITJ40zJyGI0t8jiaJh84gd+xf3NtWPcxBh
-pFkLcafohNF6C0jcbNg5VBK5JyGWQJIUft6CdLrSUN8YWeepswnm5TVEQpOLzy/5
-rEydX9h/WIrDHCUn9R9alP8C9G0ZXvbaaW4a2XMIRmYt6f+EAc8kKJVWU3yoFkaj
-4zsBQ2UrDCIUo3Xy3jjQCZTVzcRBLhE1YAe0CnlOTr2T+bHTbzLA3PwC3y1whD5z
-5u8TmMCkffj7NyaNovhqRGDJXOCOSLsY+MNVt+VCsqTTjGhxdZtnEad3bfN2fHOV
-2goBK5XZz2mWwgQek6OLSkkP1AWhb7o8qRYkVsho/acdfEtIm0yhiV1+a6SrBnQ1
-LXd7pOAumXsaeAyz4ejxQI8OkA3IpsmUUCUbELC9y6rGKTNpfAnim4aY1BkPQ8WQ
-O9X9FjOBW3yDDeAvP7N8
-=r/eu
+iQIcBAEBCAAGBQJVZbseAAoJEA9GG/3yO0PNmrEQAMzT9dCCjqAIbH62kJ7YWblK
+yD7MsxDBrYd9vCzQNIHzBwr6lNjJaeYuYrWzVpwBPlT9nnqX8pJPxc2Y8Gc+p7nx
+9cLdLeuOtqJNFLluO/86NF6sXltabJHRXEosfs0bkowHVOLvxdcW8+I/hFtszkEX
+VT/WO4MOsvRa2tOf+yM06UqZjuoHsVunGFTipWkrWum4+JydMZaMtk6u2nKnQLIl
+HNEGwuM/+pzVgmul0TlggvE+S3D6VSo1bTyS9azkEjhEin8e/DdMvLJu/HFL7dhp
+ZBnl/97DX8UFER4NXtnaBsNEdmPzJqV/g59jOH66vrMpfUG7QH7PvYC+TQCzC40i
+pH5XpYPxXEojna+18lvymz3ULmhfI5lvhXgyinu9VJ701vFHcdpQUSYEEwGq2YYd
+RVc3skkuZYCLTRgxXVAv6L6Iclz5ZG4W92avcd/+QoWuFr4XwFgpW6k37msNlntd
+VDX/NmqmwQXdLwy2HZGytT+lbwT6RZFt1MSpHNDUjBh2uo1FoIyGdh7On9W1f9EY
+f/FbbqrIo75gs4Dbq5wmcJJiY3fxevkdUEeXlcy+RMUu1kz+kEUb3vBefUbHhR0s
+Vgp48+6wEOKtHQeXeMd6JSxi1x6QHUgL7NFVYZcurYvmRBuLgd/0IX/8vpOoswj5
+E/EKuQHaViSig0ncoHRc
+=GhXL
 -----END PGP SIGNATURE-----
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)
 }