Snapshot version bump.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)

3 files changed, 24 insertions, 18 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/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
 }