Stabilize released version and add testing snapshot.

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5DE03AE

4 files changed, 112 insertions, 18 deletions

diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index c406ea5755d7..05e27f2771e9 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/opensmtpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.15 2013/05/19 14:34:21 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.16 2013/05/24 23:40:52 zx2c4 Exp $
+
+*opensmtpd-5.3.2.201305241932_p1 (24 May 2013)
+
+  24 May 2013; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +opensmtpd-5.3.2.201305241932_p1.ebuild, opensmtpd-5.3.2_p1-r1.ebuild:
+  Stabilize released version and add testing snapshot.
 
 *opensmtpd-5.3.2_p1-r1 (19 May 2013)
 
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index de7bb25d0149..e3fd6a0c1a10 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -4,24 +4,26 @@ Hash: SHA256
 AUX build-warnings.patch 349 SHA256 d711be2c534dd8465be96179a2efcbf944908d1fd980ca11d78b46979de85ff0 SHA512 3744e99cf08623197859a202fd0bacb7e936662fa48e6e635a1efb53ec264f7f22c443aafb9f283a2bf763f1515b03070e01af27e287110b3941bcfc166bf3c2 WHIRLPOOL c4b75fd86186359c14617cd4b5036efd960cba26cc8243f8a33f8fbc3fdc9653c49da303c1388cf96dbd453123d37d6858a2ed6754cf8430f12752f618a6d9c6
 AUX smtpd.initd 394 SHA256 57626759b9ffc7e8aacd66c311d36f92bdcc908ef728e52c2dc5a7d15c382572 SHA512 960cd40bc607962ceeec9dbc5d94d1b2ba0ebbf2a06163e8fb1b2a8c247cffff47db8a9ada9453d188da60a5beda23cdd063e7080bdf966e970369a0fcc800db WHIRLPOOL df221c2e3f83bb61a76dc6295860e6b10cbed27cef74b59bc905c34c843e589a32875f3e5d30f4f6c177f835d419a8ccd750d8c99da12517c6107dc7fa24f9ba
 AUX smtpd.pam 147 SHA256 d8edae7ceb5f5574426127aaa16fa00985f070065407b9de03e1963e9f7aaa58 SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086 WHIRLPOOL cb84894bb7c0f8348ad895568dd65864b15190f8f915f4501c0dd8c595fc32cd3430e5616e93286880f61d35b2c3120c731d1d091e69d77e92aeaed8817c169d
+DIST opensmtpd-201305241932p1.tar.gz 360859 SHA256 88c1f9acd1321c56b32c86368f34dd67c79d196dbb139e80bd1e16714edd8a24 SHA512 2691c26f984d340480ee1c95fcdc05570c2890c9d5d98072d95ae5baaf08ca97c92f4bba30e0ba084557e952230c92bd7c4474c0d2ca12d91ee901ed59ed3cb8 WHIRLPOOL a8402fdafb4f7e8ec49c03dfb4711797b790002f3c14aa4b5b79f01692dc96a1189a8e01c1c355fc53f19f2f304f514c4504369ad5034f64b356f90548be7a23
 DIST opensmtpd-5.3.2p1.tar.gz 345468 SHA256 512a80333d267a3cecf858b5106200a386e96894907e18e105b69cbd27699a08 SHA512 684c24f994dd0a4549327a49a60563ee0d51ce5d390f02809a98836bfec7bd2acc251e262b63771824b853c11308818e129d34b4884fdf2d9d77331b17472b25 WHIRLPOOL fe30f9b1764c13f9b4282b10f39edd9ed62a73b913df7a5cdbd9d2d683a62eebc99444573f3b252c29bfc646a2948d11ca43a4dcc3b873505bd8ff994e5b3c28
-EBUILD opensmtpd-5.3.2_p1-r1.ebuild 2047 SHA256 ba09ce9d33980394bfe15ba0042c5483b8f09bd4f21d38b3e533ebe8dce1ae41 SHA512 0bdbedf88be77e594bddf4b9fb8b3d545505c2c04723ebd26fde8dc8201f58f3b1966822bcf5ed0c5c4cc2fc0b3ba997fd79ad6138bcdac3ce2d2c06a72541ff WHIRLPOOL e14ecb4fefe3334751c852e63dcdc0245ceb1a77f00289aa1f8631ef9587d9625db73a87d2a669e2ec4631aa3a04757105b82fda437869726e9a1aecd10b405b
-MISC ChangeLog 2567 SHA256 f4f8deaf596e463e7b2085a2ab3714ee791d675037439f8690a4ab6df205e001 SHA512 f538a643b344ea575603a5bed1bdf119f2587255e80078d3b680ff3805033b014f507895a1a1e3e3261b6de32c93c7fb6042ec62a6c4103688e98637183fd7c8 WHIRLPOOL 4066fb59e544ebfb584c5fe308b79c24757c06c141c9c9afc458f4b5856bb918c180cc70b65ed64c582c132c07868efd042552d5c5e280cf5422a229eb114968
+EBUILD opensmtpd-5.3.2.201305241932_p1.ebuild 2119 SHA256 3e84d73bb76b4962cd2736187496029d3967bb587421152152ab158471719c60 SHA512 572d5c6f249e152a224935fd696687aaa036dd4bd065e5c5b9d127fd76d26dee6662039c44cfc14bafb9a63066aa61ce4caffd7d16ceaea4753f746f769d3260 WHIRLPOOL 05d18b5417f728f59e530fa809245b86c095fe89aef99e25c7bd2c39852c67ad6ae95ba443afb2ab47b278d1e00c666e6ff03f01b8c83afc922ca6da90da48ee
+EBUILD opensmtpd-5.3.2_p1-r1.ebuild 2045 SHA256 090fd19500dc1a6ba1c1845d498f82bc641bd8362b4bbd2109501b5bb6ffad7d SHA512 b7577156bda56049bba6d724f3991150e43eb9e1e1c54ff60587149d7cf48909dfd594b7cc1d481639f08e03b0f14179d286b2d51ad7cab7d2cee6b2d92be572 WHIRLPOOL bc56505aad518457b93f335a9e8dcb82a23db902d83a3c9471d98fcb0973ce891b63e4f2e5fb108e99e3b2f0e91a83ebcc27ab0c4e9a9bc84dfb652bfbb64bca
+MISC ChangeLog 2797 SHA256 6c326b7c2ee8d9c75e8f43ac150fd7b8ad407e2db27851b32a34bf905fc27afc SHA512 70a3ddbbdb69e348a0434c897c7552fcd07732f9dd60423ba131af093e7d50b96c387fa9497eaf257dd52989fd96660da99215e28327f93d8b9265e75557097e WHIRLPOOL 1f4dbb60d7ef3f34d224f9a090759252beef88d7b8c73cdc90be28d686194f1745f036d75dac2116c329b134c30ebad85d6ae1e0ef87027e980d3d805ac57c42
 MISC metadata.xml 503 SHA256 93b8d66532d8408a6d4b09aa464811631220d74112a0063a3cafd411b200b0ab SHA512 c052f461b4c31e9fe8956965d0d8dfa6939af9cecf41e1040d81f0943d1cfe41143f5a942dc72902ebc4b57f311743cf98c304020b0d60937e44087675a37b6a WHIRLPOOL 001bf05ce0a2cebabb3b7536172db8ec3f869fef28d138246ad7a287d779a08adcff63b9dbf184eb62f2c068497c807a9aedff7bdf0977c07b4b91ebb33de0e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRmOLpAAoJEEn8cBKl3gOuHrsP/36CchaPG6cXvljrbnWfHmhH
-7UHwijOb3eiImxUxsh/zhiNjjFNzCwDLCwEEqPsKPKuu26xjyiTkAFOXkjG6/cSI
-Jj6pGBqo2cqS6qdwmwOmtrvG1aX4S/bq7GJM4PE05xWPSNxSCRFUnFg4JSezp1oU
-eYhCwLeCKhl1iyuCbAoHAWWdPoPrl1WPLVKMspaNZ/U5zkbIBVVTj3YBaF4O6c0o
-roU4laRhRFJvtkrP26zPgwnPVK3DJ+kyUrufqbIEaTS5zkKWLm1vzqxxQFTz8YlT
-wS+2UMUT3REeFgkGjY79xTApaPNAE95RpCC3uQ3irHiqB5iOTTJiSzx6u3fyW9ca
-MOSeENAOBuyRxvtjNrZDIZPnW6QKz3K2JkEQk0C0muzUCOqmuO3CfYDsB5db6yi2
-YL57a2SDCU06Ie/kX9Qo7Ru0dyfWd6+I67bCVi7CSNDPHf/YdV+edOy6bz3Y+pf+
-wY2EIepyHEcUEmlC8hymNOD8RWpGndVk09nyBNrcykpzjiqlyjHT6OkuByVEKqHX
-Ty8VxtwKxA14dclbErk7RwFm2FzuGgcEHU+/Z+rhv484+p5Ijq/BIF9PdSMJwdfW
-Lerc1rf+KDLa3j3M3VR86k0QajXKRTN8sOjZWn6Ol1DJmkzUc9cteOH48mzJJP1Z
-OT9ynC6LR8Drey1wvNab
-=y8vr
+iQIcBAEBCAAGBQJRn/p/AAoJEEn8cBKl3gOuJ9sP/A8tu5+gKDUthxt4TlxMFo3V
+ijfFrb+U5h0PYxxd/JCpzMsTuoyACxI7xZ5el12rVJH/6dlgQ/A0bi7RqjF0JQXw
+CRYHqClpDK5/az1x+6LOQ8YKSm7Lc+cZsAU/48d4zXflESzhUlh0KhdMU+OeJ28Z
+LnexkvXPyCt0WbBGFR4VeXmAmXmLPjOUeajtbT3a6iEteCPw0cz9RdY6dxoUJiXr
+hiWK25xp+g/+VvYFi0/vass0/9cBmUlzwvtQhzWlvNgMbbUO48QeszsEKcAFTnDM
+LzgfK6kPrwUbnVmTWweQ0kLNsej3JtArJNSqMV6121lux+zZqW6FKW2u3Wp3nTUi
+l5wHrUzUNQRkUv5YD14yui0Zgay+JVEfxZoM2cQc+N9ugriABjn/PUfDtRakBTdG
+Er38IFHlbtoP4lSrrPsRPRJeSwYKvHB/u9HDmZgvQc0vTRUdZFH3q6J8IA+0YvhL
+TVLauUSx7BO8XxbgPggNUG4OBnwidBV62s67x9F3IOLq54M8kDq2wv7vLrpO9f4g
+oDMr6NJV0di/SlBc7Ygk2PlPXZLK4v4V55Y5vpFLo2JR4pdiaoDKUY7/hek877Pe
+N72KWkdsVKXu0eE7olVQRzN+mX864hioPes5XaH+tp5qzDf8/EFDsnfTz7YoCsR0
+hDO0HjYDuFTNl706W4nf
+=h3g0
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/opensmtpd/opensmtpd-5.3.2.201305241932_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.3.2.201305241932_p1.ebuild
new file mode 100644
index 000000000000..266e5b4a48dc
--- /dev/null
+++ b/mail-mta/opensmtpd/opensmtpd-5.3.2.201305241932_p1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.3.2.201305241932_p1.ebuild,v 1.1 2013/05/24 23:40:52 zx2c4 Exp $
+
+EAPI=5
+
+inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools versionator
+
+DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
+HOMEPAGE="http://www.opensmtpd.org/"
+MY_DP="${P}"
+MY_P="${P}"
+if [ $(get_last_version_component_index) -eq 4 ]; then
+	MY_DP="${PN}-$(get_version_component_range 4-)"
+	MY_P="${PN}-${PV/.$(get_version_component_range 4)}"
+fi
+SRC_URI="http://www.opensmtpd.org/archives/${MY_DP/_}.tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam sqlite"
+
+DEPEND="dev-libs/openssl
+		sys-libs/zlib
+		pam? ( virtual/pam )
+		sys-libs/db
+		sqlite? ( dev-db/sqlite:3 )
+		dev-libs/libevent
+		!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/_}
+
+#XXX: HACK TEMP WORKAROUND:
+S=${WORKDIR}/"opensmtpd-5.3.1p1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/build-warnings.patch
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+	AR="$(which "$AR")" econf \
+		--with-privsep-user=smtpd \
+		--with-filter-user=smtpf \
+		--with-queue-user=smtpq \
+		--with-privsep-path=/var/empty \
+		--with-sock-dir=/var/run \
+		--sysconfdir=/etc/opensmtpd \
+		$(use_with sqlite experimental-sqlite) \
+		$(use_with pam)
+		#--with-lookup-user=smtpl  will be available in the release after 5.3p1
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/smtpd.initd smtpd
+	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
+}
+
+pkg_preinst() {
+	enewgroup smtpd 25
+	enewuser smtpd 25 -1 /var/empty smtpd
+	enewgroup smtpf 251
+	enewuser smtpf 251 -1 /var/empty smtpf
+	enewgroup smtpq 252
+	enewuser smtpq 252 -1 /var/empty smtpq
+
+	# For release after 5.3p1:
+	#enewgroup smtpl 253
+	#enewuser smtpl 253 -1 /var/empty smtpl
+}
diff --git a/mail-mta/opensmtpd/opensmtpd-5.3.2_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.3.2_p1-r1.ebuild
index 349803b022cf..b9c735e8fab6 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.3.2_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.3.2_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.3.2_p1-r1.ebuild,v 1.1 2013/05/19 14:34:21 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.3.2_p1-r1.ebuild,v 1.2 2013/05/24 23:40:52 zx2c4 Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.opensmtpd.org/archives/${MY_DP/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pam sqlite"
 
 DEPEND="dev-libs/openssl