Snapshot version bump.

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

4 files changed, 41 insertions, 34 deletions

diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index 7946ac6ad614..dffe02cbdd23 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2013/06/05 16:59:27 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.19 2013/06/10 22:59:34 zx2c4 Exp $
+
+*opensmtpd-5.3.3.201306071637_p1 (10 Jun 2013)
+
+  10 Jun 2013; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +files/build-warnings-snapshot.patch, +opensmtpd-5.3.3.201306071637_p1.ebuild,
+  -opensmtpd-5.3.2.201305241932_p1.ebuild:
+  Snapshot version bump.
 
 *opensmtpd-5.3.3_p1 (05 Jun 2013)
 
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index db4c9fc50cd0..b8bf0f063aff 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX build-warnings-snapshot.patch 514 SHA256 e01d75ee1276dd1f002e99b19e7ce223e5969e7c48505e8b44053728d03c012e SHA512 818a1aaa3fb5a0494e6ef296e039014d91f0d0f5f360393466964d36ff2f9b668ea6f1cba20c58615caf2179829dad5e2671d40874b4806f33436489f0c6176d WHIRLPOOL 78e8c881a8208fd6877623a2f3b454bdde870ee5a9184c26f3408af1d6a48632644b88d472a8a742256f8fbae5aeb67c620eba136d5d4e2618ff2400c65598a1
 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-201306071637p1.tar.gz 759740 SHA256 2ce7d8c12ae1686fb19fe7439c1ebb599ab2f4a97a367ed4b74c51c9572e598a SHA512 ac823a6add9a702c927206a51cf71b6bd87465e56977a09a6dbc7603d5e9b6d3350de0e4efc8c55f1b9e5fe48e02ee0657791da7138de14cc2ed6d55825d500e WHIRLPOOL f14f86f5f0137b40ca09f0c94471987ed899fd2dfac23f4c51e60d66ef3b3d445cb63b19c0778c38ff2db1f16908f1d0582ff26d6efa75e3e6731662158499ec
 DIST opensmtpd-5.3.3p1.tar.gz 343733 SHA256 34f0e208e6fdde5c5c25bb11f468436c4d6148a8b640c32117869cad140b823c SHA512 8ea72773dca4f907d2b8285fc7abcd5c4c19ceb50b547cc4a217ec296a222f8134bfc4bc7707439b0c5d58b5354f92ebed65966179d7598c4793cad4370b087b WHIRLPOOL 1df185264da3edae4a1a1a56251af2a7e81dd1b4deabaf8d68f043beb16ca22488f775ff656dc8b84c3a3d024c0e4e67240f0c248edfb85bb2835290a28f12fe
-EBUILD opensmtpd-5.3.2.201305241932_p1.ebuild 2308 SHA256 e448263c9bf33b9c2077e831fba8c67dbebac2cfe6394cc08e1f76446f2b6518 SHA512 de1718de9c067c66a09f50d9804f2b8b148a7ddfd4444fc7622da7f67cf16308c196991985c680e36aabffc4a5a800892575d1618d58135cb7f224e043de025a WHIRLPOOL cd86db2da263bc62a65c43fb8725c2957d31184e77164c7aa6169b805cb237e616405efbfaabc2bdebef423fb48355ade6ffd444724494e8dd42577875095451
+EBUILD opensmtpd-5.3.3.201306071637_p1.ebuild 1930 SHA256 192e3380d754885d50aea55db0395c94bc77f2e6d2ac60168e0c6fc489752e34 SHA512 40b63d5641fbf24fd7c0e9837cee6c7ca462eb7f14a90cc557471dfeb907ba4c25959e31683118c9e914ac74b3d13720236622371dcca37e5612740361d6ab3b WHIRLPOOL 1e40a101a830c5a36d787ff44e32bd35247b6ef3bbe1de4c7078c6f407bf27d3dfd61609c6e0723e3cde02dd09d88b0c21c290f76a9a85f365826d56a346fb17
 EBUILD opensmtpd-5.3.3_p1.ebuild 2241 SHA256 ef6068ec5cc63feb0dd5c1f3bc0ba537d6106855c79205c22b3ad0cfb658a87d SHA512 22d9b708287efce446a50329058406f1ef7600673fb17acb8703933fe9661c3ffcd3a396dd5ecc704ffca4bb3b2f12d68b650155c8192ebb18b54d9f9013238d WHIRLPOOL d3ea07f26871dc0ea4019e2a2ed921e61958a92bc2464b66bdba5b5de384fef92492bc3d0a79a7f7ad54de40b1ed158f6f5e0734c2186a68224642202e970d43
-MISC ChangeLog 3140 SHA256 61a16bd7979bcb5890a9e616a20f22ae1fa7bc82481a0cee0a113a80f350e013 SHA512 8d4bb101f25e7233ba0d97c9cb6b5a2dfd9651baef54f6b601fc5d23ca58ee2975c88bfc77a9ddb62cbf6a322a1eabc2e984aef0e013777eccaaa28d3ba8f3cf WHIRLPOOL 938aa7c9540284965ce631fc0b227d9125526136eb5ca4a18fc4b5a67de3eb8917b9dc625afa7eb154791277ae728f25afa9d4c72900a2eb159580cee4b9de87
+MISC ChangeLog 3391 SHA256 1039b2b41a64712c03ca1db4c4682031868ee2862b55ad85c988e0fa55bbe51f SHA512 b7c9f2522a9f7f3ef5f799c530129d2e6206967464e9bc231e9f813d3d4a6c1d8ed09ef8a542f1bed668b56c492ca520ba1eada2921163038430647f09c92216 WHIRLPOOL 785b57bc2f3508aa96e221d84a7200e49142df72540eb732dc5c44a550d1a2246930d5bba6748c8fe1044984f1d9872b4443de3a23da1a1167fb57ea974c04e0
 MISC metadata.xml 582 SHA256 c5c363648f6fecb0bccaae7b9202c2ec10c2413732300cfac851bf359945a40c SHA512 86d6970f9bc766f4c0da6d5bc3fc7c0df22620507c536b202e08c2ae753874e11ba386a3b366f1e1208e035ce6052f13cfa8ec07e0b61785f2c673929720b91b WHIRLPOOL 6547028efe39bd177e36b67e58802e320a16e3f96dffcb5be6dce4e4137ef24a7da53e0c49fdd7f396fa0ce9ff7c2981943bea02a024d6cbecb261a038d82375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRr25pAAoJEEn8cBKl3gOu0loQAJeI9B7mqT6CiBQfHPCQgyXX
-EIIdlRyr2b5JQRe+11uZdeyUY44Uhg+ofRuL2qwbtIYwvDN9z4cplAkaHSDw0MQ3
-c55YUbZfSO/cOC6CTrHU2H6Zs+suqEl571rv6OoGxjoFEp0F0gd/kZUIoydHBRod
-RqlzaqCTTcPhPyWxJg/AfJ86oOjX+4iNov8hbETv25q7JYkAkk+K4XKKe6JstMVz
-S3ojZCf0OKP01CGZXK8CTeD2tW+yRHt/FX3aVxon9NJrkts5s4gAYfQh3PBdpIrC
-0oUEwbVOaUVe38vvkPe2knYhR5ILBu3uN6qmNUol5/yytJ4BO+fxjIcb/aEuEQpq
-0n/AeuG19urd0AcicEbIw+3vH5HFQjz/U6xiGs/Wuu0vwLkqwgQFwBOrYx98GxzD
-MsecT+bA3u+/kaI4LTFAVzmDS42SPCmx2fcfQ+fA3VSFdJvKxum6wden2Y4T+dih
-98jKXPaDCOxU1FGCoOEsJpwBJ+TftPlRMw5WSr9mjJ2iv6YPw3oqEoCzTfv0S+lA
-Zbg6rr+YYK1DytYXjMZsvXtAgvnHDlOVvFlNG/N5mBGttJZP8HJW1ACe6s0E18Fy
-K4MwD1m48PgMRCUxh6tmQZgVjZWW/MdpJ1VH5M3SRzlw279no5I/xleoZeORNO0h
-0GK9/7G+66pvta2kB86g
-=fV2J
+iQIcBAEBCAAGBQJRtlpOAAoJEEn8cBKl3gOuhPYQANF7QAM1j+jnacsp5yALUKQR
+8xJWNPPADEVIsoHoHf5TBM7Ad4w1jhGLmEStDwu/CDs6uB5ROaeVPfjRx476n8DW
+Ix9Oao+789MQpJ7zldoJRpenShMKFZtq7iNmgUAOr5UJhGGF7db8x2b27npFk2zk
+M/Ph9ichrTfslFMgQ+VGV9+y+IgQ57xuHpQC5r2/todIpLOraDNO98OVmm52+yrE
++rOGXGbF1KicveHQD03h0fMqMshKrT+3iJhMXLKz5yYv1R7hus9kUGTHBcu2SFUN
+qCriD+F4mfVLWKLhm2IbjGYRl8SrI1/tYgERM1wN5LTPqXexsDiBz18w6Kee9Ock
+IvL6hor1jZ2EdbNE6Zc3oC9Q531AMLp4OY8JwnsgtWmZOAechzT5ge251fA/iJtb
+/7slWb4qz5G6T0FLJPtbs4lrmnVnVx0F2p3I43yjlwQzUF145jLDgzGmmDNmFEpm
+K3TMGKD0Blh9wEwwoEfJBztel9BQxEDtE9UWkVJfZEOHSWZDfcypSpD1nCi49MNX
+auasU+dlulmnVUcNH6lJbgdcVWIMTpQ0fzbUyPeizF3NBFVw5xmrUGyU/Tx52oqM
+Fb0qq0eKOagfXIcA059EAaGUuoeFuF6gKodYg0PX9atFLFEeesKppCRlyrqtI2Qq
+J9ljVOe9bU6z+ms1Jntj
+=NwTY
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/opensmtpd/files/build-warnings-snapshot.patch b/mail-mta/opensmtpd/files/build-warnings-snapshot.patch
new file mode 100644
index 000000000000..ff6a41f681bf
--- /dev/null
+++ b/mail-mta/opensmtpd/files/build-warnings-snapshot.patch
@@ -0,0 +1,12 @@
+diff -ru opensmtpd-201306071637p1/smtpd/smtpd.h opensmtpd-201306071637p1-modified/smtpd/smtpd.h
+--- opensmtpd-201306071637p1/smtpd/smtpd.h	2013-06-07 16:37:02.000000000 +0200
++++ opensmtpd-201306071637p1-modified/smtpd/smtpd.h	2013-06-11 00:54:00.218211581 +0200
+@@ -1194,6 +1194,7 @@
+ void mfa_filter(uint64_t, int);
+ void mfa_filter_event(uint64_t, int);
+ void mfa_filter_data(uint64_t, const char *);
++void mfa_filter_prepare(void);
+ 
+ /* mproc.c */
+ int mproc_fork(struct mproc *, const char*, const char *);
+
diff --git a/mail-mta/opensmtpd/opensmtpd-5.3.2.201305241932_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.3.3.201306071637_p1.ebuild
index 2a067f32f354..5cbb1894208b 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.3.2.201305241932_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.3.3.201306071637_p1.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.201305241932_p1.ebuild,v 1.2 2013/05/27 16:04:08 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.3.3.201306071637_p1.ebuild,v 1.1 2013/06/10 22:59:34 zx2c4 Exp $
 
 EAPI=5
 
@@ -8,13 +8,11 @@ inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools versiona
 
 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)}"
+	MY_P="${PN}-$(get_version_component_range 4-)"
 fi
-SRC_URI="http://www.opensmtpd.org/archives/${MY_DP/_}.tar.gz"
+SRC_URI="http://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
@@ -43,11 +41,8 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P/_}
 
-#XXX: HACK TEMP WORKAROUND:
-S=${WORKDIR}/"opensmtpd-5.3.1p1"
-
 src_prepare() {
-	epatch "${FILESDIR}"/build-warnings.patch
+	epatch "${FILESDIR}"/build-warnings-snapshot.patch
 	epatch_user
 	eautoreconf
 }
@@ -56,14 +51,12 @@ 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() {
@@ -81,12 +74,6 @@ src_install() {
 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
 }