Use correct path to CA file and depend on package.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xA5DE03AE

4 files changed, 31 insertions, 19 deletions

diff --git a/mail-mta/opensmtpd/ChangeLog b/mail-mta/opensmtpd/ChangeLog
index 86afc3b129c4..c3b835030cf9 100644
--- a/mail-mta/opensmtpd/ChangeLog
+++ b/mail-mta/opensmtpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.37 2013/12/09 18:14:14 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/ChangeLog,v 1.38 2013/12/13 10:43:33 zx2c4 Exp $
+
+*opensmtpd-5.4.1_p1-r1 (13 Dec 2013)
+*opensmtpd-5.4.1.201312081717_p1-r1 (13 Dec 2013)
+
+  13 Dec 2013; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +opensmtpd-5.4.1.201312081717_p1-r1.ebuild, +opensmtpd-5.4.1_p1-r1.ebuild,
+  -opensmtpd-5.4.1.201312081717_p1.ebuild, -opensmtpd-5.4.1_p1.ebuild:
+  Use correct path to CA file and depend on package.
 
 *opensmtpd-5.4.1_p1 (09 Dec 2013)
 
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index fb576d8179b9..1a1e551c5016 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -8,24 +8,24 @@ AUX smtpd.service 138 SHA256 928e59e45324677ca44420dd27ce334ba607d78fce1ddd9617b
 AUX smtpd.socket 114 SHA256 0d4e598dcee849b9baf9a35f42c91e49545ffd611cfa425958d159ca3b482785 SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2 WHIRLPOOL c42d22ef8b6793bdef82e9ac39977e6269676c420c3d2b014426b469bf25f81070023ad62f2d1efaa9e6fa91035e7023cabfca585e10e3ef953671620aa87231
 DIST opensmtpd-201312081717p1.tar.gz 870391 SHA256 418730cbd22af5baa32bc4dd71d0d00d8a0fb33c86202b9ff3f28f448bcc2d18 SHA512 d9bf6bb249732ad0658ce440edba8ca50f7a7bf0ddde1fa30271a11bc943faefaea0fe6ab31a672e04a9912e5aa69d3f25376c384acd3337a45fbb51af0ca3f2 WHIRLPOOL c0374dcf9431d68cafc2ccd302f1558139b171007cf475a7f86f98ea97e900b982a555364364b553633ac50500ca5880bc80473fba5fed60149688483c7801fd
 DIST opensmtpd-5.4.1p1.tar.gz 871745 SHA256 7debbf7e55ff3687617ae2c3b38e1cf30574b96f56b869e597c0e98478e5b5d9 SHA512 29bee238c75b1f6fb6a18398294be0cddfa91b24294a74be1a2d0fc6b80474a2b8367bfa3c241fed22ed24f983cee2d53fb94b26469569014ff6874e460a87f1 WHIRLPOOL dd9f4d4426c073cb05043ba2433d5fda5cd4c28cb891a33a48025f8f5f35b56492d819707b7dbd32325856a985994bb181d98a45d836c3e4ea625d7a9fd4fff2
-EBUILD opensmtpd-5.4.1.201312081717_p1.ebuild 1939 SHA256 2fce42a7ea05bea76af97084c0c7836ae2bec96246efbc396a82126a7463d3be SHA512 a82e7eec81951de9b925ffa6cf3bc03321928b5b129595d6fdf37dd7ddcb475816b75cb30e89568fe2364262715b2e07be320d2062d6e065376b1c3dc0ede11f WHIRLPOOL ef87dd1290008de52b3abb446d5477b45ac44bc073ab90c5fe111512b0def897c7ce55e53bc9ecb619a2ee139bdac139bf3afdc8351146f6703250bb5f39274d
-EBUILD opensmtpd-5.4.1_p1.ebuild 1924 SHA256 9fc8b4e9bf3ae3c33f6984142f8de1cfc259ac326676aaf15aefb7848a996fc9 SHA512 5c24ce29b798a185fbfd17696d23997bd1d9c538539ab55e57d8387ac3b2dad3b1bbdfc3cadb0bb01705c56afa24a8094f0a2904f67c9c49f425712829daa282 WHIRLPOOL 974be56196667485b525921abc30cef9b655a3f23eb68f722f981fab28ac8bd8ff34954bf09fe13526aa0374eb889d5502a4f4f8eed4c348ae62d8ea8a158aa6
-MISC ChangeLog 7236 SHA256 779dc89d48bb90aa1aa03521314bab89febb68e57160d27d5aade17a3fad714b SHA512 926177f5bbb5d510dddb1899b48f3f6379bb1491028f1ff543a930c6e1a8ae9b8e5cea87a835ea0f33a4f6a23064a4ed6a52e1a25bbe0206b4f6e57ab06e8685 WHIRLPOOL 4c66fe8487375465ce606f6de14808fcfc883e1a4c1bd7e0598268ee7b5b9d7474024ca87cec2bf442b4d2645d0c18c24745d5f2bd045e6d0bda71f9c51d4283
+EBUILD opensmtpd-5.4.1.201312081717_p1-r1.ebuild 2023 SHA256 ae8df90481150b4e8d5376a7de0165bb2d38c6d2dc3670bd6cdd877377ac664f SHA512 9549f11692dd984efc265f124072bd9dee6f1fe89b5058bb16d01ff01d65187f19a869eb037137c63248926cbe77cc6071e5bdbdccd50f0a4af3fbb75cde1bf4 WHIRLPOOL ba5050122b8d71717f8a08f176afcffa1b886246e1fa76a1709c85cbf4673d8393ffbdd1ac21bb8c689ff73ebcc27e5e70e9c2fe0e7bc09ed88b847bf1157745
+EBUILD opensmtpd-5.4.1_p1-r1.ebuild 2008 SHA256 d9cf3e80676364025db615f1b9c93c9bd6cbc8bde1bca39979bdee3a097c9ecc SHA512 02815b8c62345d06efcd8a5000de8b4ac1a42349430fda52e02d2f39abb507a002907e27d7ad5b0771fc5e0d8a6c971104d9a341c5b9f714d4fc983b0c7be42c WHIRLPOOL 9a1899965aac07c51b24b8ab53f9e3b29b4cdccfea272668292431b1791ee897509ae25b00091839e4fe44a25daf47f3a337407bc04337dcaada512372d4234e
+MISC ChangeLog 7579 SHA256 7be129aa128335f7477b70cf19bbbcd4bbefb35859671860917b0223e24b4205 SHA512 e9dce958984d692a443167d5bef6558469b63b6c9c5c928cfc295612e0a07906f0420c6aec54028221074fc71283449b48f55ba723c50cf3f35553bd0a310b85 WHIRLPOOL b3c0006e434f60a3a1a82c2825ec14ecaab569ce89f7e171c2ac2ff71588ccef82b5d1d95eebf8bfe7666132a5c41253c497ba91eb904e04f9c7e718e987a060
 MISC metadata.xml 582 SHA256 c5c363648f6fecb0bccaae7b9202c2ec10c2413732300cfac851bf359945a40c SHA512 86d6970f9bc766f4c0da6d5bc3fc7c0df22620507c536b202e08c2ae753874e11ba386a3b366f1e1208e035ce6052f13cfa8ec07e0b61785f2c673929720b91b WHIRLPOOL 6547028efe39bd177e36b67e58802e320a16e3f96dffcb5be6dce4e4137ef24a7da53e0c49fdd7f396fa0ce9ff7c2981943bea02a024d6cbecb261a038d82375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSpghxAAoJEEn8cBKl3gOuzLAQAI8zmkhrtPcgKEBR153lTOgT
-SFNJNaIYmqP5/YI+V4i6YqnQlqd+ENrnthq/baWlpwk30tmUJY64bDyZ5QplFI0k
-494k0WCtlshUerJs3ompDIBin2iCBEclq+fK5pwv7/rDyYntLJ4L6n9cgaamJ1KH
-fVldh6aJitjOOP/3VYpKHsGtgKQXxbbKKohPm9tyjCbJjsVLqxaIa0d1MxSPUx1m
-yDhA5Xg/kuOxLY5xvA1RiSHiEpAm32CE/tgo33aAfKCS7HDUGpjqlkKxDsitL9T3
-mWFo6dcTj9mDrKL32g1ma8+reGG/NJyhFO2/Zn+9EZBrdYeURj93GF3IOspPDLGa
-4mkz/utecEBrMtpPXNQ/7HY3R/QtqoklBB8hyJ/fqcUd/5GkhfnZEZyf1Kdw0qLl
-1cSCyR0kHs2NOKQv0DaowXRHOoC5M9Gzsm35RVZDHDpnAwAsx+RkFkx/eEZQmJh0
-H6XGlAU8WJdsB1yeSemalHg7iMF+LDjbuUt6wQz2spPKl8Vc7kOVABcj9NoCXYfj
-GcMAOZiAL1pkYXc6yh7tnbyFTiG4WgL1uu022u3y7U5yocXdoZ19WinTYVm+ppyu
-cxUe530oEIxFiapFFX2jNUwgjNgfkmsD53u1/XFejgG7RmdDCQJZTNk9oOSxwW+i
-uPFhaN8ZkwRGAtoODTY0
-=9B5g
+iQIcBAEBCAAGBQJSquTXAAoJEEn8cBKl3gOuAx0P/Av7NT5rEAF0d+iEefjQN6ge
+3LWqfpJbLdxGEtsjMBHxMAW7pVbotLh6UbycFLAarZfl1kE8sB5bjp7XoUQYtpXY
+qkf4rENmUqi/+tjE97bhv2QIlxxeZ52iZA0ksFTpwKzhMeZhsu/5/GoWFFdfafAO
+A6Ywc2y0XVRe01tlOp9qyTqEplawu5jVD2JNzvOZ/QMktEbsnIPKFrHYQr0DNBjW
+okBN27h0i7vbM+tb3jQs/Ou4XxWXxxiMNco5pEHOAKyQjYPIB3BF0PCZzWDB05by
+g92Qa+W4VoAB/ftUmJIBH+x3q76kIjjpGc1WWPvTrwxGlVLKQFaaryBY4V9/6JvM
+u5kDsm8hh25iQ5OM0Bnhocns6TLqKYGyhzFZXaHmFXicjrTRP9R+TRXPAnzuFFQ0
+a6d/EWh71oA2vGWP92L2HYAyrBeryn3cGoI9HInWwjAYt3Xo0vDFSGhWj3BxUwN9
+lXVtce5f/pcNgKvGntLPly1CYdbnIdb7vSxV2N2XTAeJN0uy6LkCClY1BZ8nvCbL
+99haq0M7EX6VFOWNbFxVRh5hp2GbrODH7Bi2upGGp5mMp7BuC0aBPBz8ubY7FpHh
+2OExdgs4fQgBaw7IV9BBlqmKvh5vxOwbjzemxb1XGGTFp+RQC4DUaAn4f5jD/iTn
+nItUKuqlKbKeKiC8miXq
+=xcSL
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.1.201312081717_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.1.201312081717_p1-r1.ebuild
index bcbd1d1dfd61..aa9e21c4464d 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.4.1.201312081717_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.4.1.201312081717_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.4.1.201312081717_p1.ebuild,v 1.1 2013/12/09 18:08:34 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.1.201312081717_p1-r1.ebuild,v 1.1 2013/12/13 10:43:33 zx2c4 Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ DEPEND="dev-libs/openssl
 		sys-libs/db
 		sqlite? ( dev-db/sqlite:3 )
 		dev-libs/libevent
+		app-misc/ca-certificates
 		!mail-mta/courier
 		!mail-mta/esmtp
 		!mail-mta/exim
@@ -54,6 +55,7 @@ src_configure() {
 		--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)
 }
diff --git a/mail-mta/opensmtpd/opensmtpd-5.4.1_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.4.1_p1-r1.ebuild
index 59d0b49d3fde..d76141c29699 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.4.1_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.4.1_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.4.1_p1.ebuild,v 1.1 2013/12/09 18:14:14 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/opensmtpd/opensmtpd-5.4.1_p1-r1.ebuild,v 1.1 2013/12/13 10:43:33 zx2c4 Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ DEPEND="dev-libs/openssl
 		sys-libs/db
 		sqlite? ( dev-db/sqlite:3 )
 		dev-libs/libevent
+		app-misc/ca-certificates
 		!mail-mta/courier
 		!mail-mta/esmtp
 		!mail-mta/exim
@@ -54,6 +55,7 @@ src_configure() {
 		--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)
 }