Revision bump: add missing configure option for building with BerkDB support, bug #554654. Put socket and PID files into /run, instead of /var/run

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

4 files changed, 114 insertions, 19 deletions

diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index 0ecec897052b..b110dbb03cbc 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.76 2015/07/02 12:19:41 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.77 2015/07/18 11:33:58 pinkbyte Exp $
+
+*opensmtpd-5.7.1_p1-r1 (18 Jul 2015)
+
+  18 Jul 2015; Sergey Popov <pinkbyte@gentoo.org>
+  +opensmtpd-5.7.1_p1-r1.ebuild, files/smtpd.initd:
+  Revision bump: add missing configure option for building with BerkDB support,
+  bug #554654. Put socket and PID files into /run, instead of /var/run
 
   02 Jul 2015; Jason A. Donenfeld <zx2c4@gentoo.org>
   -files/opensmtpd-5.4.5_p2-libevent-version-macro.patch,
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 3776ab9e90e0..1688b2f70811 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,30 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX smtpd.initd 428 SHA256 ba340a264ed98642b3783cbbfd6f49c3a06878afbd0856163782fc6bdeae3ff9 SHA512 46010ff4b87b1891f842ef9dc52c38730de9fbb7f2d0ace99b8c58737d353fab5f570b53f69da838f6ddfe9db88145d4c6d3a257e1590ef6ae026cfff6a054e3 WHIRLPOOL 3ce205433bc62d36d8ee850852752e5cfe2aaafe2367d200d4fab2099d60b0db9af64199c8f46139485d52c09a4981860e5a053e6d7ab4a55a84feb49a8331ed
+AUX smtpd.initd 427 SHA256 2fa29134f1d740988ae914f908210e2bfc3144165b30375b9e9ffb69d43038ab SHA512 db08c6deda3b6af818ffaae5f5170ed2d26ddcc26143ef284235e2e2b8dbe15865fc8349f86715f2176fa6ba619aaa33a969ed434dea583e73283ac02e0a6946 WHIRLPOOL 2e5ea3c24e826ea3c61d1a2116153529c00ee42ffa65859b2154d2ab051b1dbf1bbbaaa3381b23efd4d0a465e122419c4d61a081787b5430be34aa405b8d16c9
 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-201506112227p1.tar.gz 706259 SHA256 f938796d2655f554e695adff6a3f3bbc4b1326912327b98acc7e29f705b9cf63 SHA512 f1724c1f2233dc43f4e5db780e12cfbaa7237dfbd0f70b30237c5d7bf2eed370ef6ed1f3d674473fc34d42fca6bb13e3d1152f29d16e29c7c9f86db6071713fb WHIRLPOOL f7454975f256ef50d085774516805227c1dfc4129e57290dca4cb8484fd0b8e6df45a74c6f5c9704461d5f558f50cf3795700313d6394f8d9b61fe95dd8b692b
 DIST opensmtpd-5.7.1p1.tar.gz 708295 SHA256 67e9dd9682ca8c181e84e66c76245a4a8f6205834f915a2c021cdfeb22049e3a SHA512 df09c980b25a6e91a62f6de83b18e376f6c81a5bf0039fa91da90b2fe4d67bf4bc2dc6787b2d9aca0eb859cc149f980dd9c342516af5262231c97b133f804c1a WHIRLPOOL f864ceafcc323ef61faeeb379e696ea740e39761153fda28f03805fd6c3c3c41d4c61108bbe62fcb81afd2794f32b4deef094337536feecab6bc9cb717016f0a
 EBUILD opensmtpd-5.4.6.201506112227_p1.ebuild 2204 SHA256 ec0499249428ac824958e7581e5eb3d0c1bc4c06940cfcab529297a4e7943185 SHA512 1c79ec0c81b3cfa49df997434ddb0f604bca85dc6aa719fd463fad2a1aadd8b921f756d1a657b67577ca44830fb03bd73f1b1ea50d388bcc3eae17dc4c39a96f WHIRLPOOL cda1394b03d393e66201d60b800af1327983078e17ea81acfd14fee3a3706ff788c0c2b2325a6940ff21550af0ea0b28cf67c436d4b5e5ee1da261734ac62169
+EBUILD opensmtpd-5.7.1_p1-r1.ebuild 2335 SHA256 765ae85158a25f873bfb81c04621cb51ca1e1ead03a51666b9cc6374099ea8af SHA512 7d559d0c1d836cbb17f5723b6e94e5d9a7b36926aa4de810bf053a048ef8af0c8a230092c63428d411bed78eb09ee7f2e8df325ab84a3c028d8d1747d76ecaa8 WHIRLPOOL 02bcdf2d554d63ac56588c365055b5ce286b19f3da2d2ce584ca9859b64c59645a30f335cde2aeb4bd301d6526c0a0b078bc11eceb0e565f4b6d68fc0d371578
 EBUILD opensmtpd-5.7.1_p1.ebuild 2189 SHA256 40c4f9aaf699e3c59b051480cdcc26f2136d976f1cb8360373a6e04be02157c7 SHA512 5d62433e9a708708a63aaf0162f7eed7a62bb568868aa6b0711679ff2a9f063dbc4c3e05e2d1aa90f5095374825a72b3ac065a9def5154004663d6ffc72609e0 WHIRLPOOL 46655763f3babde9269586d3ea7ee838c28cee0ce37ccdb94133bfd3cfa7a3122e262cb18848c24b69ba02ad84ef3923c00ec7dd9e1ff804d8b45a9a1ebe38ac
-MISC ChangeLog 15129 SHA256 0d1bbe8fdd955aa7f9c20d3cf1a1479ce6be88303921c63c576705135d9e2a75 SHA512 2ae8730bdbca99cb7b153c88c76ab0047c20afd397be208b83c2aa8aebcdd478bb1e779a4536dd1b28ae66fd3eadd529170d45651e370e807e741f4a946a9531 WHIRLPOOL 2f890e900920fb1088b14d1f740d04f675a66c5e7b534f474e0f8827c36590c71c82875c2da92184d0c96aa9fc7a1e6c2e9c03fb09324a27ae91114af71f81d9
+MISC ChangeLog 15424 SHA256 693f40eef59a1e28a28a869465557a2b7e2f39f872098369b6ea887019d508ee SHA512 df1d1aa4558fded51023cba21c86519a4a87fc4d1e7743e432dac1f510ff342d9e9b8c7034fa79d27ce7d2cc2a900e095b95b6c31f6157eb50730cf3ff2c19a5 WHIRLPOOL 76048f3594ba6fae38a01900f78d5bf93b14f44800e66059b377c449a2caae55db57144c3fcfebe67b76b43e4f42896f47b522ab2557e26e725d2611dd28a805
 MISC metadata.xml 582 SHA256 c5c363648f6fecb0bccaae7b9202c2ec10c2413732300cfac851bf359945a40c SHA512 86d6970f9bc766f4c0da6d5bc3fc7c0df22620507c536b202e08c2ae753874e11ba386a3b366f1e1208e035ce6052f13cfa8ec07e0b61785f2c673929720b91b WHIRLPOOL 6547028efe39bd177e36b67e58802e320a16e3f96dffcb5be6dce4e4137ef24a7da53e0c49fdd7f396fa0ce9ff7c2981943bea02a024d6cbecb261a038d82375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVlSxdAAoJEA9GG/3yO0PNjDsP/jHlpmSo7VJQuBqX/cCNKT20
-T1hLJ46NtBFUBx7ULXDDUC1hPazISYu87MbcGWUD/7L0IZB2Fa6xS0C2vmUC/ZMB
-G2oqHvMGA0WxEkJJOcN+2t0ZL0+Db2VVF+fAPIL8mBDtrTdljvyY79S065ki6irN
-5m+BVgOfKR9ckclKPcZQjwFuqa2zDBVrEKM7kprjG3d5WFqKMt67NbwrYHsHGMYK
-UGRe5lLke6cB2enW54iLLgZ8BtELBj8gdkan1pmd+r8UsS/rFHlRCRTmzKv0iENQ
-seKo2+14YqEsOVsxduMjsDeKxPr1jhYu6jihL7czlFzaikTAVmXV639oySXZe8C5
-7uE7GaY+GNFm7JwzAyJYm4YXPcaNq7j1h/r0wrqdBfJzV+5kr+IU2tZo65Ngju5R
-V/U8re8EjRQmWtv9xOUNacIWzHZUVtkkl+x86DHyfCoBtx/HVn/6r17/p9hAIu9d
-DEJLwEJuTfX+IGeUy7fL+VC2+R7EsRJwjN08m7iQs56l5GFEu0xqq+TyKLZCqH/X
-W3jLSM9W7lm47FlcbEsXKpcaHL5alYBNWdS7UmS8fJ+dqDta6+BO3tHDphgVi32h
-l/QsAS2ze0uCdmO+0n82kvTVtvb4LTFnY9QDaid9z8HmnxpUfYPZEjGemfMV6K95
-7mGd+YO4zA2eJFSWruFu
-=Dgz+
+iQEcBAEBCAAGBQJVqjmoAAoJECo/aRed9267l0MIAKWxmc0uAOoN8YOLDrQY2Lh9
+x1SaFU/qTcFPzGWEHzQr/N5L1KJ73tMY1qe2hNvSvVaKgIbgt5XsEodCVIhq8xlR
+hC87j8HhmO0ym2YqTWuk8yhPok/5RljiYQe866f02KF9PRokcAETUdKav/i3Bu2v
+EM358684fSK4YFTGJmOQH9ULqKYAwGMrKQNeSjL18GHCYG9bznaLJ+XEJ25svxIt
+QL7eng3yjzzexd3bDJH9ilnfOMRXVZWb3Hd3U/hbPqQsGoglKNRzfI/8O7Ht/lmT
+KzJ0jtePEQqI0YAhsbtJ85CVsoV0qJ6z/hK1u9Uo8rLEpyg/Dyszw5zQPnxGRhM=
+=14T5
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/opensmtpd/files/smtpd.initd b/mail-mta/opensmtpd/files/smtpd.initd
index 50a200d9c7f4..b4daf6a3c35c 100644
--- a/mail-mta/opensmtpd/files/smtpd.initd
+++ b/mail-mta/opensmtpd/files/smtpd.initd
@@ -1,10 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2013 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/files/smtpd.initd,v 1.3 2013/11/20 05:16:56 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/files/smtpd.initd,v 1.4 2015/07/18 11:33:58 pinkbyte Exp $
 
 command="smtpd"
-start_stop_daemon_args="--pidfile=/var/run/smtpd.pid"
+start_stop_daemon_args="--pidfile=/run/smtpd.pid"
 description="SMTP daemon from OpenBSD"
 
 depend() {
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.1_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.1_p1-r1.ebuild
new file mode 100644
index 000000000000..a6a4e6dcdc48
--- /dev/null
+++ b/mail-mta/opensmtpd/opensmtpd-5.7.1_p1-r1.ebuild
@@ -0,0 +1,93 @@
+# 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.7.1_p1-r1.ebuild,v 1.1 2015/07/18 11:33:58 pinkbyte 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 +mta"
+
+DEPEND="dev-libs/openssl:0
+		sys-libs/zlib
+		pam? ( virtual/pam )
+		sys-libs/db:=
+		dev-libs/libevent
+		app-misc/ca-certificates
+		net-mail/mailbase
+		net-libs/libasr
+		!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() {
+	# Use /run instead of /var/run
+	sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+	AR="$(which "$AR")" econf \
+		--enable-table-db \
+		--with-privsep-user=smtpd \
+		--with-queue-user=smtpq \
+		--with-privsep-path=/var/empty \
+		--with-sock-dir=/run \
+		--sysconfdir=/etc/opensmtpd \
+		--with-ca-file=/etc/ssl/certs/ca-certificates.crt \
+		$(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
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
+	einfo "Redis, and many other useful addons and filters are"
+	einfo "available in the mail-filter/opensmtpd-extras package."
+	einfo
+}