Version bump. Removed old

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

4 files changed, 64 insertions, 9 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 764bda7d5975..0e662b70eb23 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.718 2015/06/28 03:34:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.719 2015/08/07 11:21:21 polynomial-c Exp $
+
+*samba-4.2.3 (07 Aug 2015)
+
+  07 Aug 2015; Lars Wendler <polynomial-c@gentoo.org> -samba-4.2.0.ebuild,
+  +samba-4.2.3.ebuild, +files/samba-4.2.3-heimdal_compilefix.patch:
+  Version bump. Removed old.
 
   28 Jun 2015; Patrick Lauer <patrick@gentoo.org> samba-4.0.26.ebuild,
   samba-4.1.18.ebuild, samba-4.1.19.ebuild, samba-4.2.0.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 32f07021081f..4141fa91e857 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
 AUX 3.5/nsswitch.conf-wins 392 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8 SHA512 9cf4116d21531cb783af952ff891f0f70482aef10545f963efc9f86d281e7f03606b8607ef379bc257f51481f24aacc13ae44ad42048937d54caeae7e1f25db4 WHIRLPOOL a6ed5123aac2e125abbecbbbdf5897015aea9258258982a5b4fc585636d3810ee6cc4de0cdcfc2e9817d3a98178959771c95a40874e867de24c35a2f8fee8e5a
@@ -33,6 +36,7 @@ AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4
 AUX samba-4.0.19-automagic_aio_fix.patch 2020 SHA256 99a67b4e8a5847ac416ceadb4d97bf004019d0ab4e75663443b3bee071665fbf SHA512 2a694760a82f484d454be988bc614e90fd8feb67db6b08e3770e45f322964ffa03e2840e70a7981cb60764a8bd3a8c1be7f22fc26a8de2438cdd94de43556626 WHIRLPOOL d0c25b7f1b557a995a668e11c9e9ca75203673b91aee12fad8e9ec35e576cbada71adc4515d0501f63801edf7bf3696673442811d99b425a603656bbe8d333c6
 AUX samba-4.1.14-libsystemd.patch 2343 SHA256 a04576719ea11d1609a537a5cd365b60a3a2080538c4ada05636a88ac345ac2d SHA512 7951a563019ad6b858710b61366164a1c6d919fade03c528af13df13f153580c12a0e570c341e872e7aaec22f30e6b93b7ac2c4a34d5d272876e320d09a35979 WHIRLPOOL 29169bb5925a583a05dc00acfe9c405f9ee8f264de9d375413dcdedce0d8884c9d2d1f8091e5a15accfd986c7f1dcb4564e3499269a302b9e14d951a60e2e659
 AUX samba-4.1.14-named.conf.dlz.patch 505 SHA256 a59037c7d1f2d567a4505ac01259500e62e5244312acd273bfb5ad61869e9326 SHA512 de95a8d6e6b15bdb82dff649095fae12615ecf0b93da4163eaf8033660939fb2104b7eb9b5a9f223ffd4947cc9e39ee794ffe1434554731a931cdd0fd39dbd33 WHIRLPOOL 6382dfa2c97a1e537981b80faa8bda5a6ab7fa7db131bf46b85a490ad6da4f6e11fbc54ed7bf8b4b56cedd93e4ab6d5a913ae1977b5cf6723a37cde5ff145f52
+AUX samba-4.2.3-heimdal_compilefix.patch 819 SHA256 6cf93d127aa900c1e9a4fb8a3bdff6054d78a7adb798c6f409feffc13c714ee9 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536 WHIRLPOOL 882a52598013a40165d87616eaa016139fa89ff218dc43a6e6518123ccc18ca84e4ba275731e10ec762b22f26576eac56ad6b257cfae2e1cbc45f518a0d37007
 AUX samba.conf 32 SHA256 d578d8d4f86c61f4055164d0065b117c7345f7531a7759b78fba80dbb94c5c25 SHA512 b5d8905fb72d517d78274e4a928263bed3c57ed1cdbda773caf5cd5f7531da5c21ef9a310084d3d399c9c636be0c8424e5fc010336560ca5b41b40616398c9dd WHIRLPOOL 652b5254e0ffe78dc4c58901b35683f1c98e057da6d83e53610e5688b948623415000141d4d627f0752941558ca88d6e2cf6af411e5a8fc9fb8dfbd49e0a8e5c
 AUX samba.service 199 SHA256 0ae738fa2a15b476dbca016dfa4e1cf4b8c4a575e13edf518eb70b615c02a059 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16 WHIRLPOOL 1132081b63b1e0e1a9342d59493ebfe1d918133a4091e48c42dae7845dcaa24a0b8e7a1183d5a41b0173c3f6dbc17838a9b7a6297fc8ea0775ab150a22ae3151
 AUX smbd.service 250 SHA256 e1f5da902cd97891852f6463b2c7eddbc61e7fbd3e3c281028a806319627fc68 SHA512 a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3 WHIRLPOOL 18b6a57603a41303d207249fdb46cb4f6e887f8b9bd4921dca6b4f28a59951368d6abead2dc9d3be2c09cb2c9f295087ef5f20d121a309791b9031e3fad28b13
@@ -45,7 +49,7 @@ DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b
 DIST samba-4.0.26.tar.gz 22155521 SHA256 ce2441992c6d18950d752edb2d1274b3f7e056b2e2e8516fc42e408e4a25894a SHA512 0df6f5961b2b6af1a4356540299acae52473f9d4342762d1556c859a36a63a7b8706c94f835581e96ecbf47a2d7fb09b67f93aa3869812215e9661dda7ee1906 WHIRLPOOL fda98da46719e6f4cefa58aef56f4d75120c4386b5e398e9b2ac3aa693255a6bce9606b1bf5646708d96e4f3c8982586501ccdae7c11f223b629ab128d33ae59
 DIST samba-4.1.18.tar.gz 19550894 SHA256 5bd302355c82195271de41d4f1e0c6353bde652a23886940b310b7734256f156 SHA512 1798fc23bfa282f4e0cc047e8da6fc553f4e56a19ec1f82877a7381b7ba2d97b4687de0d499a094e725e420303e2e07038a63b9cc463f97131b91c29c0919dec WHIRLPOOL fce4c07255c882c742429a91b6faeeb079a4c85a227b803c6e2e6b7531402746f57d02099bf5104c8c7db0190ff9ca9cc69797bf30000412aecbe90906a66100
 DIST samba-4.1.19.tar.gz 19558250 SHA256 62f23dffacd4faf8ac557f9cf01a1595e39db0bbdd959c4c1890f46155c9f936 SHA512 116f022cfd55506028a14363e084080eeb93257d216958c70991b11f4f8f01195e7174371edcdd2c72cadcb7544c0b0b979d638a7a37600d7bbd0610020f028e WHIRLPOOL dd672fc7cb659f8a80177b6d19187e2557847e802db9b3cd5fd2b708dc78b9a31c675cac80afd3a36789d562a8582155c7ffcbad26b810b621cda08b0395e6c9
-DIST samba-4.2.0.tar.gz 20682204 SHA256 66a6057815a971fee64fbe936ff6cbad542421a4bd52cba8d8d41afc9abc490f SHA512 ec6f1a6276087196450cf5774690cde564beb414ab55fb7db6991f8ae470d338fb9c2b12d38232b804436efc686450d1fa19a26bc234e9f63d8c569e321357e0 WHIRLPOOL a3c44ac80f22fc34b9bcdf8d4ad20a79b275d4f7ac0006e879df80c7d1e8f7f859e47d3020c29e709aca27102165efb169c325c6c4cb691f99dace893da5ad76
+DIST samba-4.2.3.tar.gz 20721283 SHA256 b6dfa5ae4818d891ee2fcff04a5912f4a4fb2394b4f5e66a2a15b428da094c7c SHA512 33fd4deb3a9bb6ee7656fb716116f2ff3c65303ce7c13bdf2c4c618ce67e61f1d1fa77c7c29504e4bb4d6c5a094dcc54dc41999864e52ebd521d89a93666383a WHIRLPOOL 0684eae6fa815f3af99646721fd414e57e26966cc30b8c0e12bd8a1e651ac7984855521044b83becfd2beb70c5820d49d3dd1e702bb78109b34ec188b0e43191
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12310 SHA256 a65273c2fb22091cf0a643ea13b0f362c4b7366745d9ec36c75064781f79ce2d SHA512 f75298fcef9fe174b0e80d79b3bcc98c38a84ee51b9f748fdf9adec6012ed7be654156685828312b2ed99a8a64869a0bb0ffc5fe2aabcb4e30af717b266daabd WHIRLPOOL 0bea3d534cfd9305f15bf290b57e751ae4c92a1ee6f8c5620bb3d23cbe461238e6be333c11e579a653540d1ac71c04b18c85f7a78dc841d2c5f0844d8ca836ce
 EBUILD samba-3.5.22.ebuild 12313 SHA256 f480a20964b77f38138a91f30b1fadd7e71872360970c8fc481a5993dad31c66 SHA512 32e8f37c9d762e2a9c7559a9e93a2d58ffe53a27b9e6ce89e6b9004cbcafadb60b049bd40b18987e33ed6d8c3f1d029e226aa3dad3aed056a88efebd2aebe590 WHIRLPOOL 593c2f63518f92ce6197824b72b04851e90a5cc12f8afd826a01fc1c3d1ca45b6df2e3cae541f585f156410056268395cbbf44aeb189cbadf54069b0fbe540cf
@@ -53,7 +57,24 @@ EBUILD samba-3.6.25.ebuild 13518 SHA256 276106437cfc337e476e402146bb7fd5036711e1
 EBUILD samba-4.0.26.ebuild 4885 SHA256 741531814b661aa33354897b64529eab8407b36e918ded94fbb925642ad3675e SHA512 1d4c1c81b609ee88cb27a5598f77fa8f52494e2da90d1504eaa77276d3839952abc7d42a7e7b709b66c16141f1c7f131e8eaf13de48bc8ce54f40f6882810ae5 WHIRLPOOL 385af4b813d139666b5e3e92100bad753b9bde7e173440da3e8b0f667307fe380c638b7570ddd65f4db0ec7b901c7f40b8cab386161859e4a9e9cd71fe7a0844
 EBUILD samba-4.1.18.ebuild 4897 SHA256 6f794c369b9d66abea5d63153dc05994795b4ee0a201c48864d9dcbe35b36b12 SHA512 2387e6a4a51130294d814dc296e70fdaee2020c4b882c7334497c8e8a74f6b793206df3c83a320fa2288d964e5171fb5712dc9d210d480c90a74f45055b18ce5 WHIRLPOOL 443db719409d5a31ae34b9385c14742bbaab626bddee2b1845047de419893b2a8eaa56b2a5e7319ea350f09082dc0d8c90bf3aa9ca2621818d506208f270d804
 EBUILD samba-4.1.19.ebuild 4897 SHA256 ca5cd8103eacd7f3863499148ab8867987a6d9b68b82668b7c7e53898326e15e SHA512 a4f88edd264163550d6bf88ff72feb720753ec1cbd85cb0b5bfd8e3ba15590861da8cc41364c105063202d5477c3dbf71998658f2e67679dc0e52feeae8d9c69 WHIRLPOOL a6c9cfa2c3f6dc32ce817b2de3cd15299ef9666019325f6f1b0131a90786716c6f23c341d4a9e45a2fbc3ca7a3c5fe0c80ff4b3573ca42cd2094559c7cdce9c7
-EBUILD samba-4.2.0.ebuild 4845 SHA256 9a2ded86b5647a7030a8618524941dffe23478c23ce688fa67e39fc339e9d229 SHA512 55bd74d24b61349753ce1ec389cd83489cc66c5c60f6b7924770f6b9fcb9a98d65f86f6575db02612cbf96e44ca0c6a9130bbcf2ff1aaeb8e940b29eb3c7c7e3 WHIRLPOOL fe113129e9401e295bcf52bf042d6dab78229ef41eff747c17447d2097515f2699c1b8e373055c2ed4e279892e4883a2436522589e073a2b76403c97a8fa9150
-MISC ChangeLog 11364 SHA256 fa7fed9da17aec8e845a6222d3b163bee0aa67e2901f3dfc7c032f8c6d4c380a SHA512 9ddeb0722c4858bd6dd0250116cd46741d51d00f1bc0a83f66126207ea7e72d73e4475d5d0da16a634b811b42ad2e29a04e50433cbcf1b8399a6b7f763e38a7b WHIRLPOOL 44f3e4be0b5895d7b639d190b87f2883624e02fd8a89c816fc57f0f3e9bcf409b2925798ed5d0e7bd029bec35b1f80e388693cb4b8e9c28f986cba780ed9dd2a
+EBUILD samba-4.2.3.ebuild 4962 SHA256 a61822e25c24117d9d0147a8ea5af5f3478d6e6453831177af18d351347b0cf6 SHA512 90e4ade9e23c2705bcf915d5196641c924715a33975e610aa34f1350de3d975e9e7e646dc94db75db9aeb7a6f372c4780057f1b21af2f1e8385f27c2f273d439 WHIRLPOOL 5085739cbd7058cdbc6db40d689428e91e869676c71f443bc8de4e10cd5287071df663f9d65d072a3eebf64f9466ff8cf0739a3e38a52d78afe0fd259c284696
+MISC ChangeLog 11570 SHA256 700ea64c0586d7957e3ef95425683f9bd711ae4311c7cd19575b6d1cdd814e94 SHA512 8d5d99a08a409db4cf8c8e9c3a82a080de66d9aac6ff39e53bb6eb5eeadb625d0ebd07c6fc81bce1755d2441ab91d96f90787d3975814f572e2ce2a366038299 WHIRLPOOL 340948bfd379c419985c93c21a543bb10d10a0c95c8ec2cf1d01697a3e47613b2b6e9f2292c1d03f353121a39b6be809ba432535ccab67b71adf333c69c5bc2e
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCgAGBQJVxJSyAAoJEPiazRVxLXTFYkEQAJyZC31EPB2rgvBbCqYvJu2l
+a3VZJIgKISCbf4doV+ckHbR+QM2E8mpgAVX1NO0do9wv2/PZQ1YjE+sTH+PCF18M
+yTvJiR/OyWdSG20e7wqRi4jztfHPacURW49Yvs5U/r/2eycN3n56dtzFAnQ2NZgD
+e16w1ocH6uyCd6/fAVsFNDzd2cxhu8tlBukg8ezchSCVcZPu1GlcpjQ0nuclYE0+
+Ugr0Y7LVM6SghiofDdP1QAbtKuyjxRKcbRilYaFvsv767En6WUPrJCRm3HxC+V1u
+I63XoWNItE/UPgbFRBYM3qb2JwtSO6Ril6ViXj2OVV0J7L91KKTAK8mVxG9ge01m
+s2MI5NubodxFIu4o+SzLphn0DnQloV/NrkDcSFpKdXO5BI/MgGD7IU7y9f1g0VAt
+lyGqWxXfpkmKO8jR4Zo5Eu/gNyIstXy4h//cCmbnHwPbCCcjYIu8GmK53KXGZwHS
+0U0D/AcWggCm7cHMbBHRtFpRWs959VAErdiqqxM+jqCGQBkyXLUSOQNU6CU3NBQh
+ZqmRk5e7QxmZuPpIOwTIaRevBgMG+aZgRlOqZU0LZM2Z1BJZ8SvNDs3nfxSkH/GS
+58Vlp1y1WZEFYz47AvhAoCQf0oxIo5RJ+ylv3iVdD94cxyGZqyNF361vHGqEOX74
+YMWqiFNk18vhJoLPasFq
+=bf9I
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch b/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch
new file mode 100644
index 000000000000..c6f50073317a
--- /dev/null
+++ b/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/542638
+
+From: Stephan Wolf <stephan@letzte-bankreihe.de>
+
+Samba uses the build in implementation of heimdal from year 2011.
+The ebuild uses the portage version of heimdal.
+I got it fixed to patch samba kdc_init function.
+
+--- samba-4.2.3/source4/kdc/kdc.c
++++ samba-4.2.3/source4/kdc/kdc.c
+@@ -967,9 +967,9 @@
+ 	 * The old behavior in the _kdc_get_preferred_key()
+ 	 * function is use_strongest_server_key=TRUE.
+ 	 */
+-	kdc->config->as_use_strongest_session_key = false;
++	kdc->config->tgt_use_strongest_session_key = false;
+ 	kdc->config->preauth_use_strongest_session_key = false;
+-	kdc->config->tgs_use_strongest_session_key = false;
++	kdc->config->svc_use_strongest_session_key = false;
+ 	kdc->config->use_strongest_server_key = true;
+ 
+ 	/* Register hdb-samba4 hooks for use as a keytab */
diff --git a/net-fs/samba/samba-4.2.0.ebuild b/net-fs/samba/samba-4.2.3.ebuild
index 9343253cef52..e3733af8b094 100644
--- a/net-fs/samba/samba-4.2.0.ebuild
+++ b/net-fs/samba/samba-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.2.0.ebuild,v 1.3 2015/06/28 03:34:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.2.3.ebuild,v 1.1 2015/08/07 11:21:21 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -42,9 +42,9 @@ CDEPEND="${PYTHON_DEPS}
 	>=sys-libs/ldb-1.1.20
 	>=sys-libs/nss_wrapper-1.0.2
 	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.1.1[python,${PYTHON_USEDEP}]
-	>=sys-libs/tdb-1.3.4[python,${PYTHON_USEDEP}]
-	>=sys-libs/tevent-0.9.24
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
+	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.25
 	>=sys-libs/uid_wrapper-1.0.1
 	sys-libs/zlib
 	virtual/pam
@@ -66,13 +66,15 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-samba )
 "
 
-REQUIRED_USE="ads? ( acl ldap )
+REQUIRED_USE="ads? ( acl gnutls ldap )
 	${PYTHON_REQUIRED_USE}"
 
 RESTRICT="mirror"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
+
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
@@ -93,6 +95,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch ${PATCHES[@]}
+}
+
 src_configure() {
 	local myconf=''
 	use "cluster" && myconf+=" --with-ctdb-dir=/usr"