Version bump for testing

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

8 files changed, 360 insertions, 15 deletions

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index 5c35610b5c3c..114f505a7701 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.56 2013/01/22 08:11:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.57 2013/02/18 13:17:18 eras Exp $
+
+*opendkim-2.8.0_beta5 (18 Feb 2013)
+
+  18 Feb 2013; Eray Aslan <eras@gentoo.org> +files/opendkim-2.8.0-free.patch,
+  +files/opendkim-2.8.0-gnutls.patch, +files/opendkim-2.8.0-lber.patch,
+  +files/opendkim-2.8.0-libbsd.patch,
+  +files/opendkim-2.8.0-unbreak_upgrade.patch, +opendkim-2.8.0_beta5.ebuild:
+  Version bump for testing
 
 *opendkim-2.7.4-r1 (22 Jan 2013)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 3efaa7caa5c8..bf5d5795cf39 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -4,6 +4,11 @@ Hash: SHA256
 AUX opendkim-2.7.2-strl.patch 1158 SHA256 23d06779d843aecd8a8540d40effa90f7d3fa854eccbee22672731438be7c88f SHA512 57dae887354a164d6146c55d258b8b41cdfbf9df887d228ab6ae9f2868b2096b44d738897880e1ad39c2d1d2ccade655cdb2658a171499cb470e6aafc0ca72bc WHIRLPOOL 760706018224941090b82b65b613bb90f51c6cfdba4f87bd640e6f301719c137592fd54f0bc383e0fa384f4f8e4ecd3699906ad70b86ffdf85f5fb9c12842ae0
 AUX opendkim-2.7.4-DisableCryptoInit.patch 3747 SHA256 83c0fac5ed1393cdfda695637f337a2a43bcd45476f11ed7db1bc422a080f421 SHA512 c8c352a56150cf0e8a2ce4b0020c03d60da1e8c184e830b325348e1e9272df8634e014a4ae6b62d4c8c596d855ecdf163eb4c09104e31084d1643364bcf093f8 WHIRLPOOL d6ad3a4ea0c2ba7b41d06750beb3fb19dd26f29f44f1ffc6855e93f8a5e8af631c35c9b782d32a7fcb83361e881ea6dffb22d59035d9b3148cf39b37ee62f1db
 AUX opendkim-2.7.4-bsd.patch 18006 SHA256 a4cfb4d26dc7d27134f66f7b1e78b40f6c0c77f3986af787001c094c4734f95f SHA512 9ee24d02d2662b2898dd073b7ec882889fe9568d2afca8751c6ad6c68af60523d77ca79557f540607a68cb159bf0df7266122ed8fe3a3b67ca4e578b325b4892 WHIRLPOOL 8408536bd7fd080eedc99b3b133562d5049a63a61420b5a38759237dce09af8ab257f524152ca870de18c13113b6370bc5c0f8fe06fc43d89101ecbcfbb157e9
+AUX opendkim-2.8.0-free.patch 836 SHA256 4b281dff1a960000f49ca319902ad04cab2e78070e418569749df1d783e53a1c SHA512 478ac837c49b1b56301d9cf0cd12a7590d0fd4c81a816e18a100c7fd5ba6a2d614aa4948c6433fdce7bd7cdecca61cd58791476eb5baad9ad592c4684e82d8c9 WHIRLPOOL 3a7beda8091bf944ec6676c4264887bc2e38e06b238614238aad4ef16a9a953cbc42df2271ae3c55de5756c03233fe42be64a769dbc4c7487b076c7902f9b911
+AUX opendkim-2.8.0-gnutls.patch 323 SHA256 0c7738b49d7158b9832ab3a08ce4c9c381c4f4c6d8ff3dc1abf461578931ce97 SHA512 a625bc1e6a4896d1a7e81621382fadbcd2aa2dc0074d19e461f64598e1d6726e591caa5f565b81fcd1f83d467590c155d865f64eb50b0adedee1f78ea75521ec WHIRLPOOL d073d3755aed0d2c43258fb2cab43c7a92185af130d02a10c0a20c47c8dda837598a0b4b9f9373986f04f220e783debb38fab8a606dd423bd1ec34ce863ae03a
+AUX opendkim-2.8.0-lber.patch 1678 SHA256 af8acd6980536236760f14a7932897f022634585ce1599ede2f58b9a0c3900ed SHA512 60e5239bac4f86677b094e58c2e613ceb8d1e348a32e431e8b0ac3fe2ec6f626fcea68fcc27729e36d91610f6bd5eb159ade144636b468eb29722e58d0c787bf WHIRLPOOL 3a6a414bfb2794eda01994dbc014932b09be2d652b24a12af7a9643bed4a1e3805e4467655e87f6dec92f4f109ff8e9974e77397b7a02a59b0b3d5bf6d207cb9
+AUX opendkim-2.8.0-libbsd.patch 459 SHA256 f31d2023f6283f21b7bf1e9338b6b057af512733134cf1b34cc2ab2fba150478 SHA512 507a622f53c2a5304245c32236a22f89fe63fab9aeed812205c967b3d4b90adbf51838cebe556567d11caa1cf3d1c6fe04dd11caaf5564ab438b326f42e4005d WHIRLPOOL c9cbb360d1521891e4ff8e928a99c58716a42099c1a386df2de04bb9f8cb22ab670ceb94c5bdec79bad331a8161a4f0402988234c7fe9bf1137db9c7ae639739
+AUX opendkim-2.8.0-unbreak_upgrade.patch 1042 SHA256 5c115fa185bc9a64fe847599e2c0fa8d4d2925f4b2dbdef1e88769195c79046d SHA512 b415fe2f05dd16489ac59038ab15b22c77da23fe1bc3b5fc82883186b4e2b44855f546fbc1128109e84b1c19ed868cffed66c72fd4600c66c27ce4f9363b44a2 WHIRLPOOL 6304af7e66862da3c215455273d486aa4f67ae0777209e92e1c81b9537722850699fdd8c167e95412abfb2143eefcb88ff3c58c4cfc380994e27e9c41deee8e8
 AUX opendkim-unbreak_upgrade.patch 1050 SHA256 6518b34662ca366a4616ca1135d5cc529b62dd6b921d2b0074ba8fabedfbd739 SHA512 01755ba0675d19c6b1d582c502479ae843dccadc712e4af5e66fd63a333241cdd5e29fb1856020967faee5bbe454784745747c54c0994b216b7aaba340bc9107 WHIRLPOOL 6a0b6f9ebdc2a5b06a3a2b1ddd75adfe8e6109cf346ad3387718152e307db107c052b66fab7590a054a0977504f5eb705eca7e7c9d5d62c86f97d216b0d25366
 AUX opendkim.init.r2 1533 SHA256 0e8fab90020c109f602d8367a6501bfb3b397a50f020b6fade5024e2facf593c SHA512 8c7aef32c67e1ec4bf3afb0df48d861b6f1399c8a825161d00ca1400d87b084ad16de68401f9cece4cc9c07b06377641cc664d7e79750a0fc106f1088fb2dff7 WHIRLPOOL 00783d779d904118eb172f859c289d8b2b1832f1de1f17ab30a5a9f0af6ffa324395f2777b82fbde2e46d26f064d4ffec368b6734ce9cfe09173f24a7053de50
 AUX opendkim.init.r3 1545 SHA256 63f316ef776ad1a9fe87cff7748fac4574c2355b6205e3ef21285ddb84c8cb33 SHA512 c28b93f230b65ba483302dbb0f6cba0d8b2cf29cce0309521e67f6aa0e4c041b0dd69eaca8152d6b0b1b02dbe1ff9634fef0840856c8e192f17a1c24ffac7166 WHIRLPOOL f42cb79de47d2fdac26ef4a45132e996640da824aadaf0c3e66182160e941322ff78a37c18a32ca50efb0bb4fbf11b622a1ce5931146c47a06156c256d568b81
@@ -13,6 +18,7 @@ DIST opendkim-2.7.0.tar.gz 1143836 SHA256 f5c2319ec23fa20a6bd4bb1b4abc005f6a7dbb
 DIST opendkim-2.7.1.tar.gz 1153665 SHA256 782c030ce3b09d9ef536d2b98910d5a9289ba2128e8392e6ff568b2ade0282ed SHA512 76074ba23f4a4e142f6c41cc2474ac8e4281a770695a615b51ddcb0cb1b195ac295ce2be3f433e2213fc2c7b3355fa470e19d6a3421d4f0af4acb065eb498dd0 WHIRLPOOL 69a61297d1d79c2a296b99453f5b24c4c9b109b8fab9d114d627c788e1ea2b5e836b99d7c11312214794157f3a48dd8ea6cb79d8bdbc6156c3e019743df57e37
 DIST opendkim-2.7.2.tar.gz 1156510 SHA256 cf72a26506ef48a2c6b231947226ab460cdb6e05b18176ee42a94b3b6d521b42 SHA512 be1cf2329f9a871df560bcdb60f9f2277ac5220ed9f94c112410994b1dc1f1ee7274bea76b8ce7c118695f73831fb3459007b728a151ece966a1021d6774e425 WHIRLPOOL 2e07e87bf274a3644bec6c42ccc7ca0575206fa67eba8009f52f24213a74c4985b2e78eb9e6b4b0938cb513c186b0c858f2d80330019a20eee18188d39f68677
 DIST opendkim-2.7.4.tar.gz 1158496 SHA256 fa66f7ca52dd3fa94cd869e8fe9e8f849ab83d6a32a8d4ed3cf18b06b4584e76 SHA512 f897cea21832355cac5421a96a906f67aaff1bcc0ceb5e027c73845d7c0cd27ec12862a826534b01339571533cba061b86e1a1bad91c405488bada729e2846cb WHIRLPOOL afe329829211cedacc7d27b5a4d03469e1fe8935cabc0b51158a69862ef993d6438499a206628dafc31c7904b9b95d1eeb31edf6583249cf54396793af68bdbc
+DIST opendkim-2.8.0.Beta5.tar.gz 1169377 SHA256 08de42a8b98e0bee3e716081d5c5f7a785c40f9e8e99007c1809122dd33d5683 SHA512 eba961b85da1c4845d154fbcecd24e2dd2c31718d2ba61c8b47ce367b4af1e02d1c1ca3e4369b030e7cc6d3699e88c34ef4c519dd576ab33d6574095f6e6e8f8 WHIRLPOOL 07b6150b2f57b7c3ca7f61fe1c6d71f437008f9a922317434fe0a4e6fd5355b3bbacad8437ea65e8838b7dd786815f228061505d693deaa88083b5d28f1c52d3
 EBUILD opendkim-2.6.7-r1.ebuild 6380 SHA256 1fdfd5a87069115fea59cd641a554561b89666eb05283355c19429e36ef42fdb SHA512 3923604c1fa2f53ded36ee08fca144b9683f322b5f40342a46dd25085a8af18856c7b9238020f22f4f054a31d79d22d6bec85627e0aa616956b26b1821762d05 WHIRLPOOL e07276482ec7107e5b7af5bc57581bf6e04761ae9801ceb4f649b43a30467ed6d5be22fbcaa506acbb113f675f98f5100e09b0a45d4304c5b66d1642d2a8ece6
 EBUILD opendkim-2.6.8.ebuild 6380 SHA256 1251c1d8ced6ad6b0c2c51fe20699623fc5d10c41bd0b3cd73eca9b31fbd8f2a SHA512 68914959f5e82083e36e41731a2121f08e3dabd97c46849e611a09cd757017dd1f853ccaa95216ee988010634e9933767f4caae34e46cb161847d5be245ab221 WHIRLPOOL 3a3bca5c1a51066bcd91dd7e6bc29a0c364a7fdfff9c027268a11f847dcab07300e09d2d88bdd04b3fd696f4abc06275e2408f5e7535d01a5b2b6e23bd76cb63
 EBUILD opendkim-2.7.0.ebuild 5980 SHA256 bba11f3060774c3e665b8c9e0a91483a817d34f6c40268214ed2f66591059c6f SHA512 bbae17c344d99a982e549feeaeb85c9fefa3739c6b35e0e05ffc26c65b92befb4e44284c24dcd17a645e61545805fbb75b57192e8afea639a6595543bd30e87d WHIRLPOOL b256873263f8b861c8c67c453c6f737eccb526cb96ff04306bea949d002c06232f792d1a26945b943cee0db5b8b014f8557a7f54897e5854ff90f67239dcda6c
@@ -20,22 +26,23 @@ EBUILD opendkim-2.7.1.ebuild 5980 SHA256 1b0ab9e9a9c3ad9ee31c7a55102c0e8eab149f5
 EBUILD opendkim-2.7.2.ebuild 6018 SHA256 bf833332cc51619ef502df419bd1ea00f4cfac9580c0d769ee27d03e6d9be51e SHA512 46dd38590bc4683244bf57f65bf0d796cacded1a6c8507dddd7337e4b147169e7a21428b495863de52651af89020911651dc6b9d6b891fc761a61c0f886a9de1 WHIRLPOOL 4bafda1b64e90f60ead18947ec051fa55e4b7edf1be3be0208c6d365ebc5fa040253987e4b9a965e4b053f6450d41b3708d49db0f3a570a1cf397b28846f89e2
 EBUILD opendkim-2.7.4-r1.ebuild 6138 SHA256 16d706e507471182aa5d67e9451690287a3bbf6a0f4410807f8aee9277068b84 SHA512 eed7be4fb0ce31ed0d1f6f73ebfdeddb11d801f85c844cce7029526a7e3224d9d9c7d64ef968fa5c147109f8acfa06517cccd4f01360d8ca308ca9b07618b7a0 WHIRLPOOL 633101945aa98b8f0729b9c387e5a795c01101965ecd08f665009b0f773818953421c4f859e9db82631be2e7380b3e3dc21d194e5198e44f3c162ea8a352f12c
 EBUILD opendkim-2.7.4.ebuild 6085 SHA256 f94750bee3106d5cb84480fc2f0c6f211b2d5d077e287d481840ece3eb37d315 SHA512 b7fef312987158eba8c28bd8704cade8911805187465acc3bebd809fa4cc0518b23790b5205eb1d6421a868b427491f1e434de9bdea11582b5d7aa94402df3ae WHIRLPOOL 6d39660ae2a899647010ce3041b2e22794228e97ca2d45b67f6d7d3f262652ab73c9fa6c05da7565028cf6afd17c3506f3920f213462a97281780480f92880fd
-MISC ChangeLog 10038 SHA256 eae16c8dbf440bfca225fbfbf9de84cc5dbd0445845b6fbdab8ae00a5233766c SHA512 6d92b07908700da239de089535b16005b25ad16302fc3d998c71acdcf430308438b7ff9bb8f93c434489672efd1d0ce15b5dd331b34328e5020a0d4c0e896a2f WHIRLPOOL 8c316b02152debe4d2b4b23aea2397e08082d1665ef5c268777b9f921b3a48dd814cbaf0ef31547f77b418782366929d6136198b48195e4cca2cade0f1ee335c
+EBUILD opendkim-2.8.0_beta5.ebuild 6280 SHA256 3d0c56f056a945a0c239df1aa4c8c72da8c694b7ed3cb2d53ebfec837c4ce857 SHA512 52c0848edf10e7a019a4111b62c616e39fe737a732080dc10641d69f7190f96ef7d33e94cc96f639dcefd27184edd1bd481f8960ce303f677e3fbaf7f603f121 WHIRLPOOL 51eafcb7a139899346468848d068c6177a11076540003752bfed828271aba70c5739add469679aa2038ee0a772ca5b21824a175041ab7ee3c2b2512e0b0fcaaa
+MISC ChangeLog 10368 SHA256 66b117ec39f9039e6ae624cbc8a9b92606b36cdecad9a5b543ba12c09bf7f576 SHA512 2af48574611151e13b65c0a2968cd84b16abb621063e471a75882ef8d4e0ca69ab73e843706933724a60a887d96a06e1bbdf4e8126e5fb9ce7e91d4d13a36fa4 WHIRLPOOL bd5d082e72886c24c32b17eb3f60303dad0b5ed721b1b22031a5b92be3b54a69454253add697f8f2de2993b4baf62e4031dd7ebd9fe0f842086b2ab0eaac1d88
 MISC metadata.xml 1325 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb SHA512 ae25f27a0c0cc5c3460b150f3eb6369e34b3051984b58da6a81847b5e90edc62e91fdd8f0d428576ef73614db095dc3a415237cccc1cc3cc806f9d99ff588df5 WHIRLPOOL d8b1221d484e12c31d76a20e8a7e6e0d033e16884e7dd14f657d4383f24f8f9294bc51dea4f512896a4183f9299c2faef31e7540d95c418000245090a3a0cdfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/kmpAAoJEHfx8XVYajsfbOcP/RLWCPfTE3g/kk/+MfKSxPvb
-nzEfgYjc1+CFR+k0zbnVO7RXORP1b/6fceY6ywW5199PwbohWhrvQo8XJZmwwt6B
-c+DYwISr21WyiW7dOpsy00siVM+VZWIzG1UYy6We78670CWpZfTD9XheTu8VO7aL
-V62VPe1nxvjQv6oat3MGqiYbcbnxDfiYKkrESsFL17w2NsfyO7/ULUEr+PhGK83I
-GwP8M3202eu0yYrbXQRLPvGELAkxnEWxye8LqWJh1/3iN55+ecqa7llx+aFwZbzY
-FfiNtGRfJPLrsdHHnPDdVqh0/tt0xtswv2jZe5MzR2m4amiqB+lMP10VJ86Kcl0C
-Jnt80hvxpBAyA0xjIeJk6n55KljsyJQDchEzdLYK/RXQ6JTvpqpztFpxwE4ToK1J
-7fq+fNZvxsZ8anlIb6y3VfKH+MtwXQHsTN8moACYxWrdFSOD8IifnpcxxGJipxBa
-wqkPjpBMHqPg7d+O5q7M60R6qXWoU3++fouWAK6IMA201018jsDfN5UJxszNpg+s
-4hQlpH/xZ6HF6Cyprniag/EZlAB/NG83oor7ocdD0Wkw9NzD+Us3CTpilg+9h+m1
-W3hhy1waUWDtJyHQXSO4DPfAGH0Bk1heuV8niE1bq9PyFZ9dgFV+6cS2VoyJZglw
-aA1hqnXfuucDeM3G9k+2
-=urbm
+iQIcBAEBCAAGBQJRIinnAAoJEHfx8XVYajsfyO0P/2/OJ8Yq6qqlek7LpD0F48YC
+0a+BwABIxCPpKfRzhJjrLJn2no1d30L6LM/nKzOImsCIzUOiXLcI0leawR9EMXZ7
+njxRkKW0MaJ0wFyy/9zqN1NXiibzOJUAmr2EpkQmuz+QtLuB2PhDSRSdZ066A7cj
+Gto2R+uuHsfvqK4eQgCFFlLFi6o2cza5VP8VcYq4lsTYTEY0AQSoa0EWjS1vA1VG
+by97afd3b88BGdiWH8i7ogHIYdqmEVbwiybNyn9oJY985Vws5eHEONm1K8Mjbx2b
+zZDGG7LbBJ3kMdz/hfWVf8BIlGqivWAu4FBwdxtz90rj4JbOaFkJEJUneI9WPf0s
+Qri99uUb2dYetVkArQKJ0lAZUfxzL8cF4lUm4Q+0OcjWhRKRXMtPZhHucLZ8uIWf
+dPr3eKqZP2zFrcrQpFvXkq2Tby7cisqpg4Ha4HbLjjj/pm5rGBPYVQByiRYWdj54
+NIFGibKx7rkjZeZUuDj4MO/7FaRudUnDhqmqbEMMPUu0CPcC1qd/8ZRl4Lhl4Xn+
+OfDt3y5q/2PGHuNUYvaRCaXbS3eWt2R9uWvMB+GwGS+hMntBNklkTmkFeV1cRbGi
+PfYaLXqZWxGqwNhj8idyCO1KyiiKqkf6sh/7vgUOXO3r0TUinP3J+sQTexzoQIMB
+SjbzNzvNTIWtbauivO17
+=iBNT
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/files/opendkim-2.8.0-free.patch b/mail-filter/opendkim/files/opendkim-2.8.0-free.patch
new file mode 100644
index 000000000000..d99fe84eff3a
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.8.0-free.patch
@@ -0,0 +1,32 @@
+diff --git a/libopendkim/dkim-cache.c b/libopendkim/dkim-cache.c
+index 1321b74..1bb10e8 100644
+--- a/libopendkim/dkim-cache.c
++++ b/libopendkim/dkim-cache.c
+@@ -20,6 +20,7 @@
+ #include <errno.h>
+ #include <pthread.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ /* libdb includes */
+ #include <db.h>
+diff --git a/opendkim/util.c b/opendkim/util.c
+index e9de05e..37cdf46 100644
+--- a/opendkim/util.c
++++ b/opendkim/util.c
+@@ -1013,8 +1013,13 @@ dkimf_mkpath(char *path, size_t pathlen, char *root, char *file)
+ 	}
+ 	else if (root[0] == '\0')			/* no root, use cwd */
+ 	{
+-		(void) getcwd(path, pathlen);
+-		strlcat(path, "/", pathlen);
++		char *p;
++
++		p = getcwd(path, pathlen);
++		if (p == NULL)
++			strlcpy(path, "./", pathlen);
++		else
++			strlcat(path, "/", pathlen);
+ 		strlcat(path, file, pathlen);
+ 	}
+ 	else						/* use root */
diff --git a/mail-filter/opendkim/files/opendkim-2.8.0-gnutls.patch b/mail-filter/opendkim/files/opendkim-2.8.0-gnutls.patch
new file mode 100644
index 000000000000..c2520d3f22cf
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.8.0-gnutls.patch
@@ -0,0 +1,13 @@
+--- opendkim/opendkim-testmsg.c	2013-02-15 01:36:45.000000000 +0200
++++ opendkim/opendkim-testmsg.c	2013-02-18 14:40:41.411736713 +0200
+@@ -15,6 +15,10 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#ifdef USE_GNUTLS
++# include <gnutls/gnutls.h>
++#endif /* USE_GNUTLS */
++
+ /* libopendkim includes */
+ #include <dkim.h>
+ 
diff --git a/mail-filter/opendkim/files/opendkim-2.8.0-lber.patch b/mail-filter/opendkim/files/opendkim-2.8.0-lber.patch
new file mode 100644
index 000000000000..0fb5dc9fe7bf
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.8.0-lber.patch
@@ -0,0 +1,48 @@
+only in patch2:
+unchanged:
+--- opendkim-2.8.0~beta5.orig/configure.ac
++++ opendkim-2.8.0~beta5/configure.ac
+@@ -1713,7 +1713,7 @@
+ 			AC_MSG_RESULT($ldappath)
+ 		        ldap_found="yes"
+ 			OPENLDAP_CPPFLAGS="-I$ldappath/include"
+-			OPENLDAP_LIBS="-L$ldappath/lib -lldap"
++			OPENLDAP_LIBS="-L$ldappath/lib -lldap -llber"
+ 		else
+ 			AC_MSG_ERROR(not found at $ldappath)
+ 		fi
+@@ -1727,7 +1727,7 @@
+ 				AC_MSG_RESULT($d)
+ 		        	ldap_found="yes"
+ 				OPENLDAP_CPPFLAGS="-I$ldappath/include"
+-				OPENLDAP_LIBS="-L$ldappath/lib -lldap"
++				OPENLDAP_LIBS="-L$ldappath/lib -lldap -llber"
+ 				break
+ 			fi
+ 		done
+only in patch2:
+unchanged:
+--- opendkim-2.8.0~beta5.orig/opendkim/Makefile.am
++++ opendkim-2.8.0~beta5/opendkim/Makefile.am
+@@ -28,7 +28,7 @@
+ opendkim_CFLAGS = $(PTHREAD_CFLAGS) $(LIBCRYPTO_CFLAGS) $(COV_CFLAGS)
+ opendkim_CPPFLAGS = -I$(srcdir)/../libopendkim $(LIBCRYPTO_CPPFLAGS)
+ opendkim_LDFLAGS = $(LIBCRYPTO_LIBDIRS) $(LIBMILTER_LIBDIRS) $(PTHREAD_CFLAGS) $(COV_LDFLAGS)
+-opendkim_LDADD = ../libopendkim/libopendkim.la $(LIBMILTER_LIBS) $(LIBCRYPTO_LIBS) $(PTHREAD_LIBS) $(COV_LIBADD)
++opendkim_LDADD = ../libopendkim/libopendkim.la $(LIBMILTER_LIBS) $(LIBCRYPTO_LIBS) $(PTHREAD_LIBS) $(COV_LIBADD) $(LIBRESOLV)
+ if STRL
+ opendkim_CFLAGS += -I$(top_srcdir)/libstrl
+ opendkim_LDADD += ../libstrl/libstrl.la
+only in patch2:
+unchanged:
+--- opendkim-2.8.0~beta5.orig/libopendkim/tests/Makefile.am
++++ opendkim-2.8.0~beta5/libopendkim/tests/Makefile.am
+@@ -6,7 +6,7 @@
+ AM_CFLAGS += -g
+ endif
+ 
+-LDADD = ../libopendkim.la $(COV_LIBADD) $(LIBCRYPTO_LIBS)
++LDADD = ../libopendkim.la $(COV_LIBADD) $(LIBCRYPTO_LIBS) $(LIBRESOLV)
+ AM_CPPFLAGS = -I..
+ 
+ if STRL
diff --git a/mail-filter/opendkim/files/opendkim-2.8.0-libbsd.patch b/mail-filter/opendkim/files/opendkim-2.8.0-libbsd.patch
new file mode 100644
index 000000000000..1ccf0aadc3cd
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.8.0-libbsd.patch
@@ -0,0 +1,19 @@
+--- libopendkim/tests/t-test153.c	2013-02-12 23:28:23.000000000 +0200
++++ libopendkim/tests/t-test153.c	2013-02-18 14:31:56.012827510 +0200
+@@ -14,6 +14,16 @@
+ #include <string.h>
+ #include <stdio.h>
+ 
++/* libbsd if found */
++#ifdef USE_BSD_H
++# include <bsd/string.h>
++#endif /* USE_BSD_H */
++
++/* libstrl if needed */
++#ifdef USE_STRL_H
++# include <strl.h>
++#endif /* USE_STRL_H */
++
+ #ifdef USE_GNUTLS
+ # include <gnutls/gnutls.h>
+ #endif /* USE_GNUTLS */
diff --git a/mail-filter/opendkim/files/opendkim-2.8.0-unbreak_upgrade.patch b/mail-filter/opendkim/files/opendkim-2.8.0-unbreak_upgrade.patch
new file mode 100644
index 000000000000..433d5995f4bd
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.8.0-unbreak_upgrade.patch
@@ -0,0 +1,23 @@
+--- configure.ac	2013-02-12 23:29:44.000000000 +0200
++++ configure.ac	2013-02-18 13:58:28.499097605 +0200
+@@ -240,11 +240,15 @@
+ # we need to include <strl.h> if:
+ # (a) strlcat and strlcpy weren't found, since we'll be rolling our own; OR
+ # (b) an installed strl.h was found and no bsd/string.h was found
+-if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \) -a x"$bsdstrl_h_found" = x"no"
+-then
+-	AC_DEFINE([USE_STRL_H], 1,
+-	          [Define to 1 if you need to include <strl.h> to get the `strlcat()' and `strlcpy()' functions.])
+-fi
++
++# Gentoo specific: Don't include strl.h - breaks upgrading from
++# <=mail-filter/opendkim-2.7.2.  We link against libbsd always.
++
++#if test x"$strl_h_found" = x"yes" -o \( x"$strl_found" = x"no" -a x"$libstrl_found" = x"no" \) -a x"$bsdstrl_h_found" = x"no"
++#then
++#	AC_DEFINE([USE_STRL_H], 1,
++#	          [Define to 1 if you need to include <strl.h> to get the `strlcat()' and `strlcpy()' functions.])
++#fi
+ 
+ if test x"$bsdstrl_h_found" = x"yes"
+ then
diff --git a/mail-filter/opendkim/opendkim-2.8.0_beta5.ebuild b/mail-filter/opendkim/opendkim-2.8.0_beta5.ebuild
new file mode 100644
index 000000000000..5edf50a56fe0
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.8.0_beta5.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.8.0_beta5.ebuild,v 1.1 2013/02/18 13:17:18 eras Exp $
+
+EAPI=5
+inherit eutils db-use autotools user
+
+# for betas
+MY_P=${P/_b/.B}
+S=${WORKDIR}/${PN}-2.8.0
+SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
+
+DESCRIPTION="A milter-based application to provide DKIM signing and verification"
+HOMEPAGE="http://opendkim.org"
+#SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
+
+LICENSE="Sendmail-Open-Source BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+berkdb gnutls ldap lua opendbx poll sasl +ssl static-libs unbound"
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	dev-libs/libbsd
+	ssl? ( >=dev-libs/openssl-0.9.8 )
+	berkdb? ( >=sys-libs/db-3.2 )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( dev-lang/lua )
+	ldap? ( net-nds/openldap )
+	sasl? ( dev-libs/cyrus-sasl )
+	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
+	!unbound? ( net-libs/ldns )
+	gnutls? ( >=net-libs/gnutls-2.11.7 )"
+
+RDEPEND="${DEPEND}
+	sys-process/psmisc"
+
+REQUIRED_USE="sasl? ( ldap )"
+
+pkg_setup() {
+	enewgroup milter
+	# mail-milter/spamass-milter creates milter user with this home directory
+	# For consistency reasons, milter user must be created here with this home directory
+	# even though this package doesn't need a home directory for this user (#280571)
+	enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
+	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
+	       -e 's:/etc/mail:/etc/opendkim:g' \
+	       -e 's:mailnull:milter:g' \
+	       -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \
+		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		   stats/opendkim-reportstats || die
+
+	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
+		|| die
+
+	# don't go over the sock length and fail
+	sed -i -e '/^sock/s/t-sign-ss-macro-value-file.sock/t-s-s-m-v-f.sock/' \
+		opendkim/tests/t-sign-ss-macro-value-file.lua || die
+
+	epatch "${FILESDIR}/${PN}-2.8.0-unbreak_upgrade.patch"
+	epatch "${FILESDIR}/${PN}-2.8.0-free.patch"
+	epatch "${FILESDIR}/${PN}-2.8.0-lber.patch"
+	epatch "${FILESDIR}/${PN}-2.8.0-libbsd.patch"
+	epatch "${FILESDIR}/${PN}-2.8.0-gnutls.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use berkdb ; then
+		myconf=$(db_includedir)
+		myconf="--with-db-incdir=${myconf#-I}"
+		myconf+=" --enable-popauth"
+		myconf+=" --enable-query_cache"
+		myconf+=" --enable-stats"
+	fi
+	if use unbound; then
+		myconf+=" --with-unbound"
+	else
+		myconf+=" --with-ldns"
+	fi
+	if use ldap; then
+		myconf+=" $(use_with sasl)"
+	fi
+	econf \
+		$(use_with berkdb db) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_enable poll) \
+		$(use_enable static-libs static) \
+		$(use_with gnutls) \
+		${myconf} \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-filter \
+		--enable-adsp_lists \
+		--enable-dkim_reputation \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-redirect \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-rpath \
+		--disable-live-testing \
+		--with-test-socket=/tmp/opendkim-S
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dosbin stats/opendkim-reportstats
+	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
+	dodir /etc/opendkim /var/lib/opendkim
+	fowners milter:milter /var/lib/opendkim
+
+	# default configuration
+	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
+		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
+			> "${D}"/etc/opendkim/opendkim.conf
+		if use unbound; then
+			echo TrustedAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
+		fi
+		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
+		if use berkdb; then
+			echo Statistics /var/lib/opendkim/stats.dat >> \
+				"${D}"/etc/opendkim/opendkim.conf
+		fi
+	fi
+
+	use static-libs || find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	elog "If you want to sign your mail messages and need some help"
+	elog "please run:"
+	elog "  emerge --config ${CATEGORY}/${PN}"
+	elog "It will help you create your key and give you hints on how"
+	elog "to configure your DNS and MTA."
+
+	ewarn "Make sure your MTA has r/w access to the socket file."
+	ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
+	ewarn "to milter group or you can simply set UMask to 000."
+}
+
+pkg_config() {
+	local selector keysize pubkey
+
+	read -p "Enter the selector name (default ${HOSTNAME}): " selector
+	[[ -n "${selector}" ]] || selector=${HOSTNAME}
+	if [[ -z "${selector}" ]]; then
+		eerror "Oddly enough, you don't have a HOSTNAME."
+		return 1
+	fi
+	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
+		ewarn "The private key for this selector already exists."
+	else
+		keysize=1024
+		# generate the private and public keys
+		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
+			-s ${selector} -d '(your domain)' && \
+			chown milter:milter \
+			"${ROOT}"etc/opendkim/"${selector}".private || \
+				{ eerror "Failed to create private and public keys." ; return 1; }
+		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
+	fi
+
+	# opendkim selector configuration
+	echo
+	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
+	einfo "  Keyfile /etc/opendkim/${selector}.private"
+	einfo "  Selector ${selector}"
+
+	# MTA configuration
+	echo
+	einfo "If you are using Postfix, add following lines to your main.cf:"
+	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
+	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
+	einfo "  and read http://www.postfix.org/MILTER_README.html"
+
+	# DNS configuration
+	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+	cat "${ROOT}"etc/opendkim/${selector}.txt
+	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+	einfo
+	einfo "Also look at the ADSP http://tools.ietf.org/html/rfc5617"
+}