Bump versions

(Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A5DE03AE)

5 files changed, 42 insertions, 88 deletions

diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index 6548e757bdb5..8a4aac80ce45 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-mta/opensmtpd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.64 2014/11/02 18:39:44 robbat2 Exp $
+# 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 $
+
+*opensmtpd-5.4.4_p1 (08 Jan 2015)
+*opensmtpd-5.4.4.201501060207_p1 (08 Jan 2015)
+
+  08 Jan 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +files/opensmtpd-5.4.4_p1-setgroups-header.patch,
+  +opensmtpd-5.4.4.201501060207_p1.ebuild, +opensmtpd-5.4.4_p1.ebuild,
+  -opensmtpd-5.4.1_p1-r1.ebuild, -opensmtpd-5.4.2.201406192306_p1.ebuild,
+  -opensmtpd-5.4.2_p1.ebuild:
+  Bump versions
 
   02 Nov 2014; Robin H. Johnson <robbat2@gentoo.org>
   opensmtpd-5.4.1_p1-r1.ebuild, opensmtpd-5.4.2.201406192306_p1.ebuild,
diff --git a/mail-mta/opensmtpd/files/opensmtpd-5.4.4_p1-setgroups-header.patch b/mail-mta/opensmtpd/files/opensmtpd-5.4.4_p1-setgroups-header.patch
new file mode 100644
index 000000000000..926c473636c6
--- /dev/null
+++ b/mail-mta/opensmtpd/files/opensmtpd-5.4.4_p1-setgroups-header.patch
@@ -0,0 +1,22 @@
+diff -ru opensmtpd-5.4.4p1/smtpd/ca.c opensmtpd-5.4.4p1-modified/smtpd/ca.c
+--- opensmtpd-5.4.4p1/smtpd/ca.c	2014-12-24 11:46:55.000000000 +0100
++++ opensmtpd-5.4.4p1-modified/smtpd/ca.c	2015-01-08 17:09:37.845328217 +0100
+@@ -30,6 +30,7 @@
+ #include <imsg.h>
+ #include <pwd.h>
+ #include <err.h>
++#include <grp.h>
+ 
+ #include <openssl/ssl.h>
+ #include <openssl/pem.h>
+diff -ru opensmtpd-5.4.4p1/smtpd/pony.c opensmtpd-5.4.4p1-modified/smtpd/pony.c
+--- opensmtpd-5.4.4p1/smtpd/pony.c	2014-12-24 11:46:55.000000000 +0100
++++ opensmtpd-5.4.4p1-modified/smtpd/pony.c	2015-01-08 17:09:47.117393942 +0100
+@@ -35,6 +35,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <vis.h>
++#include <grp.h>
+ 
+ #include "smtpd.h"
+ #include "log.h"
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.2_p1.ebuild
deleted file mode 100644
index e333420e6f2c..000000000000
--- a/mail-mta/opensmtpd/opensmtpd-5.4.2_p1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.2_p1.ebuild,v 1.4 2014/11/02 18:39:44 robbat2 Exp $
-
-EAPI=5
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="http://www.opensmtpd.org/"
-MY_P="${P}"
-if [ $(get_last_version_component_index) -eq 4 ]; then
-	MY_P="${PN}-$(get_version_component_range 4-)"
-fi
-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"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		pam? ( virtual/pam )
-		sys-libs/db
-		sqlite? ( dev-db/sqlite:3 )
-		dev-libs/libevent
-		app-misc/ca-certificates
-		net-mail/mailbase
-		!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/_}
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-privsep-user=smtpd \
-		--with-queue-user=smtpq \
-		--with-privsep-path=/var/empty \
-		--with-sock-dir=/var/run \
-		--sysconfdir=/etc/opensmtpd \
-		--with-ca-file=/etc/ssl/certs/ca-certificates.crt \
-		$(use_with sqlite experimental-sqlite) \
-		$(use_with pam)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/smtpd.initd smtpd
-	systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
-	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-	if use mta ; then
-		dodir /usr/sbin
-		dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-		dosym /usr/sbin/smtpctl /usr/bin/sendmail
-		dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-	fi
-}
-
-pkg_preinst() {
-	enewgroup smtpd 25
-	enewuser smtpd 25 -1 /var/empty smtpd
-	enewgroup smtpq 252
-	enewuser smtpq 252 -1 /var/empty smtpq
-}
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.2.201406192306_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.4.201501060207_p1.ebuild
index b7452f735afe..636a0f4b8669 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.4.2.201406192306_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.4.4.201501060207_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.2.201406192306_p1.ebuild,v 1.2 2014/11/02 18:39:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.4.201501060207_p1.ebuild,v 1.1 2015/01/08 16:17:52 zx2c4 Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ DEPEND="dev-libs/openssl
 		dev-libs/libevent
 		app-misc/ca-certificates
 		net-mail/mailbase
+		net-libs/libasr
 		!mail-mta/courier
 		!mail-mta/esmtp
 		!mail-mta/exim
@@ -44,6 +45,7 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_P/_}
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}"-5.4.4_p1-setgroups-header.patch
 	epatch_user
 	eautoreconf
 }
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.1_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.4_p1.ebuild
index c1736510291e..bed15fd91447 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.4.1_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.4.4_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1_p1-r1.ebuild,v 1.3 2014/11/02 18:39:44 robbat2 Exp $
+# $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 $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ DEPEND="dev-libs/openssl
 		dev-libs/libevent
 		app-misc/ca-certificates
 		net-mail/mailbase
+		net-libs/libasr
 		!mail-mta/courier
 		!mail-mta/esmtp
 		!mail-mta/exim
@@ -44,6 +45,7 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_P/_}
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}"-5.4.4_p1-setgroups-header.patch
 	epatch_user
 	eautoreconf
 }