Security bump (bug #493726). Removed old

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

5 files changed, 510 insertions, 38 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 17a5c15faf47..dd703d875098 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.636 2013/12/08 17:05:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.637 2013/12/09 08:44:49 polynomial-c Exp $
+
+*samba-4.1.3 (09 Dec 2013)
+*samba-4.0.13 (09 Dec 2013)
+*samba-3.6.22 (09 Dec 2013)
+
+  09 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +samba-3.6.22.ebuild,
+  -samba-4.0.11.ebuild, +samba-4.0.13.ebuild, -samba-4.1.1.ebuild,
+  +samba-4.1.3.ebuild:
+  Security bump (bug #493726). Removed old.
 
   08 Dec 2013; Agostino Sarubbo <ago@gentoo.org> samba-3.6.20.ebuild:
   Stable for alpha, wrt bug #491070
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 969f84b8ae59..14697c00e47f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
@@ -43,36 +43,38 @@ DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb
 DIST samba-3.6.19.tar.gz 34115773 SHA256 addecc6acb05d3ffd0934f7f91d8e83852705b9e858e13c506e51c297259a92e SHA512 5d1fcb4b178536061e7ae7a61befbb84c5fce0dba805345a25ad3d393f04068f0ade719aaed42844d4541e64d6cbed28a06b0793e1c74431a4ad5a2cba6bdcc5 WHIRLPOOL 2cafb6a250b9d5b8c22a8ca1914f3af1b8786554c61aed6060b151a971a1169e28196df5e02b35fbc7abc60622e3aebac24022cfd0b4656ca4e51401816a4ab3
 DIST samba-3.6.20.tar.gz 34112208 SHA256 5fb5daa65c06c890cdc938fd30daca40945afe2880e6a4b95b8eea418e003a0f SHA512 c87233f00051b98968a9aed1aa7c44e44bb0195efe460a55bd2541a02732afc02115fd6f5d75b3a9df568bfa4492d17d03f2fbe8b8dc6a5f984da87668b6708a WHIRLPOOL 22df9b68ce942dcb8a867e6a3840775760dc2017ba8691a17bdfc517b501147a30c4e6e50ecb915b97e7a46c22ae60d19ed813265c79001f6d8a7a009397a408
 DIST samba-3.6.21.tar.gz 34116243 SHA256 6b960abee66058a9390be036ae42efc463790b2cf4c53f842660fa36a3dc979e SHA512 c9ad1cf019bbb29fb34ade6dfebfa23d2a56fe05878c5f4f3660b406a4e3415c77a14862d34c7fca9d7da7527a1866fd42d1eaf2090a81e00e33581b5afa71cf WHIRLPOOL 42f381d3eefaa48e356d0fd99358e77b15adcb005b5ee88b3d364bd0ae1bccf231afd5c76b860811e09023711c34322b11d13cc9e1a298ed84aa93ddbb1a59e1
-DIST samba-4.0.11.tar.gz 22098694 SHA256 155acd0dcc4a195074ae434129accaf420560cfa8e78a742c8633ae1c3c70096 SHA512 6a9eabda91701d44537f9efa82444c1a5b3cceca467c76c69aecabb529c0c1bb38144404fa636734b4259d634ffb0d33d1dc52570ca54b08781187fb08bae12b WHIRLPOOL b4703f8a906e273f1a7f2ebcace62e00ebcb6d6f53fe885602d4f4188d2e8e30841ea6696cdd0cc84623ec17fa9339280cc69eb83bb98e4fde938e8acb8e0e76
+DIST samba-3.6.22.tar.gz 34122131 SHA256 30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea SHA512 13b7d4c7ee24434626cf7e835e302252a281f00dfff1b83fd3c28f8264c1ce7afa0aa6ad237c28015fd2a39a38954189a140b36c27d8b0434a48b46d56936981 WHIRLPOOL 0daaeee4a7c7c3807ceda6558041708cca6c28ad20051cfff5547477f2acab8b896a4168f44a85eb7722dec5d3772bbc59566e79e1876820057f1f3107962cb5
 DIST samba-4.0.12.tar.gz 22099958 SHA256 2f4176a35cbf4d76906592e88d31f6c9479c061439f0e7509a5265b779e68822 SHA512 c1bc44cb531a6f865015c6b5eb8af924d6463da9044144c5fad812d4a131f06785512022d2fbe8bbf1414751dfdf83088d9e9d41b4f3c6386797bb4bc7570723 WHIRLPOOL 0ff4b7d269b198978a9d805440c9ec84fac340c770b45634ebba2bfe01ba061c5543a204461f06ebe83bec7e1f6e5feb664927f2137a9e27e8f260658b89f0b5
-DIST samba-4.1.1.tar.gz 23152191 SHA256 c70c343f5bcd2bfe3f4b55860e680a6ed70ce30106c8aa16ef89f8a1a85e2628 SHA512 4108f0f72df591afde9549bc86c2b8a3552e6db51d65b84cad960682a412e0f7c5ccb5202d2d8256937ecbdbf47762f1837b5449d3f1157445f485e5de2cd7f9 WHIRLPOOL 65c6d9f8ec78b1c30ac3d284000d5d41c6dc9e77123504ef5d9bedcee7d22d87ceaebd33f93651d76725e72932be1e83fd32a1f3816040a43002be76985d934b
+DIST samba-4.0.13.tar.gz 22105105 SHA256 cb970bb016fd6403a31a2002b8db57f9201c6333feaafcc6b689eb5bd24174ac SHA512 9170d7f9e5d586091fbba6c8f7fe6b23c969310ab5a1f6e51f5b700385a02086b70ccc5686bddf3687dacf5a6f67aa4ba60360e9eb1ff9dd0d6ac3c5731228e4 WHIRLPOOL 07785fe0b3573fe0a30b55d23a958586a942f3dcfdc341ade5c5aa52c402b12c6f069f090b50f84037da01b97a4159d68a4743112aa420f24700f64e74a4f090
 DIST samba-4.1.2.tar.gz 23154809 SHA256 d8883b6ada2a3dafc7b238b043c333004910e4d4bdb207fc8734646ee8b1b042 SHA512 5104c88298567e1338200c039272d2b820fb0335ef363c7f4e1e02d0f1ef2d7d09d4aa919a02cd6b7dee318c89d58b69b650f8811253ce7cfcf1745dc65ba4c9 WHIRLPOOL ef6559a55f249fdb19bf8c9c8da702f5c3362fd2e0e7ef1b24feaf2c6d614becce232bf57235a8c7a1215beaa3358b1a35414602257df332dffbf4b99fb327b6
+DIST samba-4.1.3.tar.gz 23161646 SHA256 71da208d412b8d15ee26d2a76b2247df357242177d995fe5d9320355432e24db SHA512 c3e08df4e23c02ab759e819809ac8b146972508bbbbfc666e47ac180dea75dde85564e839aa4935e43f9b894bdf650fd3ed36463e70e9065c6e1c745142984d5 WHIRLPOOL e8f3025f66ae3cb3086642f2115bb23191b16f57f4e4d818ae5572664c969857873c5074205c17450c43507fd7391b22bd021be120971377f040a25775f7efa9
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
 EBUILD samba-3.6.19.ebuild 12764 SHA256 4c48786cedfe51b1cf7e0033011029c89e6ad51143f497d9de5a11a99d4fdbef SHA512 bc3ad37d66e90a3f7d2c408f6add5333d79e2bd6620bfd1986c0edae5acc3ae13e96a094bb81e14dd23c69aab8b91fbecf36293058fac48f742d1b746d9ec046 WHIRLPOOL 808174cfb900b5e4e5ccea43bfce6e38349f7c324567e55edd68e8b2ac45ce855a6ef61e7dc06671b09160afb1e9d17825acc59656f8bebf529568a77b5921b9
 EBUILD samba-3.6.20.ebuild 12759 SHA256 6a5e1e111b31b3ba87f632cae0feaec281ee910aa08aef6cafc6ab14eb94b7a3 SHA512 e38dfbef6126f910095b01eacd56a049909178dd82f65c3b652f1a6ac418bb75c810a66e6872623ed43529bd63d5540efb9c59b3b81436bb9a1bf0f1d3745bd7 WHIRLPOOL 9b5efa9d5ab52b1f1352083ee6f12bd50bfb86d4f81c668007f0b4f141caf81592daa8da5b22111f067356b6df04f61a99a988048a8e4afe1193e6ba3429b9fb
 EBUILD samba-3.6.21.ebuild 12812 SHA256 9fc75de96f03115d6e1404879af7175c3e13a8242ae308e30280f9ef80929e06 SHA512 9f3a1b6e4925786e5de9ae46a432ccde53e75b46624ed204a401c4901d6832880760a51bc8e32c94d56b4d197a22e2f07a75a2eacf4d5a14dfa03871476286eb WHIRLPOOL 2f7087c03d4d37021f167ce710921ec59804296ae6c517ba8feaf9626fa7835ebd4e133307b191f4367b4f61c23d2aa3c8975861dba92eddf952d5cfe69ade79
-EBUILD samba-4.0.11.ebuild 4881 SHA256 a6eaaa610a90b084d0469f432a9150c3861d51d389463c3ac14f5725ee9722d5 SHA512 ca47596db887740d0ba48290b1c036b3221ad0c78184e7d258a87fa63dd742c6246b71e1d5f5cb3cbe9fc239a1f16c559d9bd6f06e98a9611a5dac40d309eea0 WHIRLPOOL 253b72a1033c5752020717018b59470766e99e0c0f63a755bd50aa269bba53e1a8b249e31035979be150932369ab87ce041a604f2c12c085ec467fb269308314
+EBUILD samba-3.6.22.ebuild 12812 SHA256 13b6ea3ca5d298a610286b805347beeacb2fa5c7f3f2ed2f541f94a810953977 SHA512 6bf76716d9502926d7883b19b1838afa96b2411fe6d5f5f4332ae4d27721a88f98808ade513c0bfc84874f9bc08d03dd26ac29022ad9e84b88e7964d3c91ad56 WHIRLPOOL 14ffb2f9a746168191fd119980180d20e45e5891c1221a5283c333a24886566469a7a23168edd6c5d24d766e7d2d8454d15318ef3870eb0827eb3f21a3bbbb7a
 EBUILD samba-4.0.12.ebuild 4744 SHA256 937201f621f2dc60232f399928ec7c573da08aee6c039fb3b98c6360fd9bac58 SHA512 4177070348f92564681519d877647fe6e7a9eea5b1287e6750dbe25fbc8f2760b9f31a933d94c2d189e04d66542f667f7aecb2b1627a5eb21060e8b911d857b3 WHIRLPOOL 7810a02ee738f2a01e1e1461f67fb4773330b00904012cc1b4d801dfd55f82b69328c0f720c5a4eed43b6efa230f2b5cc84b62f10c65bd446d673e9f7865f876
-EBUILD samba-4.1.1.ebuild 4718 SHA256 d1b6512480b0276b88538cd9c2ed655e5bb0c2ca22d11e10b6a36d33e1279c9a SHA512 34aeb1ca7f251f479db62c5e43c0e3bf2339d7bb1b4c8dcdeb525e9f73b3e28ddc615f349ed6eb2f2cca6c0ebce12ac526f1558852b80ba0ce6b2c44210450a5 WHIRLPOOL c4de291adc078fe498aeed67dc8686bcb586cb98ba38dec78a8239c93a756bb601de16a0b21e0b1939a9bed507fd568e0b4efc68e60efac72f2a48e2d000b3a9
+EBUILD samba-4.0.13.ebuild 4744 SHA256 f6ec46a3d6a6847961fc69843ff6c97991b8a5ad3c4170122522352acba77b57 SHA512 3f86e74ea7849b25d24904eb8c7ddd615bf566f43acffb271e8591eb83a95ae4a20fa49185273cdbfb4285aad48c39b8a4251714c4a08553fc6baac0d8dc19cf WHIRLPOOL 784bcc095147e060435d276e3a15cceeea4cf45cd47f275b98250bbbb5922a0bbfe33564fd01d806acc8251477ef5eab837577999770a6897eef33a8a1b1c35b
 EBUILD samba-4.1.2.ebuild 4625 SHA256 be90f08a373e95eb1dbf47cffed6bea9d4b971ba0da07225eba060f584deb06f SHA512 15062b06f43ed0d93cd1274ef4878cdaad85bc467492e52eaf875d712bebcc874bc1c4e0e50e1ba813b0aa927c0a5c3735c586b1af5c4ac18c0aff7a73d89c82 WHIRLPOOL 16566984dfb23a5b0a41f94ba9559b97ee1bd5dafae2c9fce9892aa60590cae5c4c11e92de7fc93cdcbedaa7bd0cf9eb80e4938c9623c9e15dd8ed989d2ed66a
-MISC ChangeLog 105064 SHA256 c1e9d9ac6915d347b5f90e8581922fd6dcaeffb871ef0aba84397a31ef4ce32e SHA512 8cd938d4a099d06a1f36b2c2901605593e3a903bdd3fded03942e326d5fbd8b5120961f9ae8c6394c34103ad520c4b40333f0b35d0e0b8eed9957978a5a2eac0 WHIRLPOOL ae81bdd068b28c52de627b8993d6ad20f66417767fc6a4137db59ca96abbf9e49ade6dad0becbf323e616d1b92e240b7cb25d87a5bc259d398778be98aa23dc2
+EBUILD samba-4.1.3.ebuild 4625 SHA256 6e8f42dbc60ede3609178289df4bfc242b45ea134b3d3846b5b1be10ea6f9074 SHA512 e67e10346017b734477e1acec6a0bc7695bbc79db79efa9f2c5b61b6fc474cd030bbd24a8b57627887d941e0c4cfd014e0aba19edb7891b36f68c2012582936f WHIRLPOOL de409048168598587543d84f05fe92efa931ba64df2918cfa65076335c6ab6db70a5ff22aa9eebb4ab944e64e79a7c18b7e4cca2cae431a2ab34cb8970acd2df
+MISC ChangeLog 105368 SHA256 c8634d760f14ae7fab8b69112a0d3e673b6e99f4595b270b08a730e513fc140f SHA512 6912887edc9ef892b00aeeb6a05b6270e73e18173a3511c51384169fcce28071b9e37e6a9f1690985421bdbe4abc74cd297efe640d9c44aa8b1caa515bfb0289 WHIRLPOOL f55d913c8566004bbed45e0425ee0433873fe40192511cde2a7da870ff497c50ccca3f1c4f36bf01d8da9c40b7e7c7bcb999e7c4cc6e3e242e4b161cd2979856
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSpKYAAAoJELp701BxlEWfJM8QAJFU+aGdV1H0VcrH3ZO65eTt
-yjVzwrPfpwrGXyL1X2ESvHC3fLbQTmgCofw6NauL7ruVtBU9FRQKXzV5vzMoVdXG
-QDDgp2MpkvKrYotE1brxeGuwLR7CE7ZY3PG1bZLEzhEwTAAuJit6gYCIiBheluTW
-PB+GUtDsT4doGd/jkP9D0v5/cX6VLvVlz/cF9V3jfVme2UveeHR5mDiJ4xOtXzZu
-jKFHl+Z/faUikFdIW55UubWTgyCANP+SZuWjSWpebHxRiUtH/oUD5QVc4D0ASV+L
-JrUk+o27qTTc6SaT+dsGouprLWK4XU1LIwfdQnv55VmBElchzmiM7DiESgGs1X0c
-lIjNIxPW8yFKFRGpmQKv8XF+DNlrZV96sKhAiTelAuAXBZCJIOmd5RVpP1d4Lar8
-oOl9HTUTHuj1yIKl1JZwtXgHuurpwt/LnZ78biMfPaV7vtFUHz4Ia6nwyKBVv+Wx
-5YH7HVVf1/cuHDTsZA9zVe/YpQSD6OyBc3gCLhBgNWzOnKvm956F+/a21YDpJjIV
-Z9NbM34PmR89zAy/jyvrmteCbw1AAdU3YOjUaDl0X/dhgajmOGx+fNT2KqINSr6P
-47DFf0F8shq6Lzq0gI4to9FHgyWebjiA/wcCGXLHFLjvF1qNxj78fbN/2bb2rtRf
-VUUy6FgMc1pkC9uMyGES
-=kyDt
+iQIcBAEBCAAGBQJSpYMCAAoJEPiazRVxLXTFu6gP/1FPDy2qtCYBx8mp0ugGEBJA
+421APrP2u5pCbZiOQp+3NdUhrZNjDSRGbKC942rMNr8xT+f8zHnY3F0fbbkBCRJW
+0DVN+2W1kjkA/Ei9rpGHlHXuRjD5/hlFJbi/53eBkU74TQqSKoXZuAju9yfdOUF1
+4mtY7epxmWxxNzQlMvXcaVvENfM0smxqrc6qD+8mVJYVWMw2smt4JBEYh0rpQf5D
+BC6WD5ST1nVoZVkaVdZvp7f3A3Yx32syg3rysawBWZtVcXEnzLypK3U2dB10MMrQ
+Ak4gB9gH70g5Lk9EE60BVpNF5RpwV5JwySeBZG9a74jzJBWtErXa/6QafQNrDoTN
+8q8VTFF9UlaSpUUYzf8fF+JxtjVoh8QCM93p87MHYdpOgYHsfatA62AbVru4+ftc
+ThZ3+uvYJCBvQ0GreEyHRvNjuOS2y+rbo5lsaL5i5Axcd09tIbVyfQ+SOAIvGtlk
+nhMVRCxxo8MsJA9V57IqyOP2iAsdR/3bnkZUcUnVf22m5eHohFV05rQqSI2dElXF
+ok8KbSMpfUxVBRX8Dz0teFfkuOein4BZT8y3+QiTOcvy2BiNdVvxYr0pbDJzvDfb
+Z1kiFfZADtxwVMxG4OCqcA8J6mjbUORQvtjAxHonQSJcvmYYAHzg97h5JGcSxdxG
+f7Qb2pM+LP20Hp3bIVIg
+=u1Ge
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.6.22.ebuild b/net-fs/samba/samba-3.6.22.ebuild
new file mode 100644
index 000000000000..aa41c5b636de
--- /dev/null
+++ b/net-fs/samba/samba-3.6.22.ebuild
@@ -0,0 +1,466 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.22.ebuild,v 1.1 2013/12/09 08:44:49 polynomial-c Exp $
+
+EAPI=4
+
+inherit pam versionator multilib eutils flag-o-matic systemd
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Library bits of the samba network filesystem"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
+	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
+	swat syslog +winbind"
+
+DEPEND="dev-libs/popt
+	>=sys-libs/talloc-2.0.5
+	>=sys-libs/tdb-1.2.9
+	>=sys-libs/tevent-0.9.18
+	virtual/libiconv
+	ads? ( virtual/krb5 sys-fs/e2fsprogs
+		client? ( sys-apps/keyutils ) )
+	avahi? ( net-dns/avahi[dbus] )
+	caps? ( sys-libs/libcap )
+	client? ( !net-fs/mount-cifs
+		dev-libs/iniparser )
+	cluster? ( >=dev-db/ctdb-1.13 )
+	cups? ( net-print/cups )
+	debug? ( dev-libs/dmalloc )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	ldap? ( net-nds/openldap )
+	ldb? ( sys-libs/ldb )
+	pam? ( virtual/pam
+		winbind? ( dev-libs/iniparser )
+	)
+	readline? ( >=sys-libs/readline-5.2 )
+	selinux? ( sec-policy/selinux-samba )
+	syslog? ( virtual/logger )"
+
+RDEPEND="${DEPEND}
+	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
+			client? ( net-fs/cifs-utils ) )"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+SBINPROGS=""
+BINPROGS=""
+KRBPLUGIN=""
+PLUGINEXT=".so"
+SHAREDMODS=""
+
+S="${WORKDIR}/${MY_P}/source3"
+
+# TODO:
+# - enable iPrint on Prefix/OSX and Darwin?
+# - selftest-prefix? selftest?
+# - AFS?
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+REQUIRED_USE="
+	ads? ( ldap )
+	swat? ( server )
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use winbind &&
+			[[ $(tc-getCC)$ == *gcc* ]] &&
+			[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
+		then
+			eerror "It is a known issue that ${P} will not build with "
+			eerror "winbind use flag enabled when using gcc < 4.3 ."
+			eerror "Please use at least the latest stable gcc version."
+			die "Using sys-devel/gcc < 4.3 with winbind use flag."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use server ; then
+		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
+		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
+			bin/profiles bin/sharesec bin/eventlogadm bin/smbta-util
+			$(usex client "" "bin/smbclient")"
+
+		use swat && SBINPROGS="${SBINPROGS} bin/swat"
+		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
+		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
+	fi
+
+	if use client ; then
+		BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
+			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
+			bin/ntlm_auth"
+
+	fi
+
+	use cups && BINPROGS="${BINPROGS} bin/smbspool"
+#	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
+
+	if use winbind ; then
+		BINPROGS="${BINPROGS} bin/wbinfo"
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
+		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
+		use cluster && SHAREDMODS="${SHAREDMODS},idmap_tdb2"
+		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
+	fi
+}
+
+src_prepare() {
+	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
+
+	# ensure that winbind has correct ldflags (QA notice)
+	sed -i \
+		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
+		configure || die "sed failed"
+	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/smb.conf.default.patch
+}
+
+src_configure() {
+	local myconf
+
+	# Filter out -fPIE
+	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
+
+	#Allowing alpha/s390/sh to build
+	if use alpha || use s390 || use sh ; then
+		replace-flags -O? -O1
+	fi
+
+	# http://wiki.samba.org/index.php/CTDB_Setup
+	use cluster && myconf+=" --disable-pie"
+
+	# Upstream refuses to make this configurable
+	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
+
+	#bug #399141 wrap newer iniparser version
+	has_version ">=dev-libs/iniparser-3.0.0" && \
+		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
+
+	# Notes:
+	# - automount is only needed in conjunction with NIS and we don't have that
+	# anymore => LDAP?
+	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
+	econf ${myconf} \
+		--with-piddir="${EPREFIX}"/var/run/samba \
+		--sysconfdir="${EPREFIX}"/etc/samba \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable debug developer) \
+		--enable-largefile \
+		--enable-socket-wrapper \
+		--enable-nss-wrapper \
+		$(use_enable swat) \
+		$(use_enable debug dmalloc) \
+		$(use_enable cups) \
+		--disable-iprint \
+		$(use_enable fam) \
+		--enable-shared-libs \
+		--disable-dnssd \
+		$(use_enable avahi) \
+		--with-fhs \
+		--with-privatedir="${EPREFIX}"/var/lib/samba/private \
+		--with-rootsbindir="${EPREFIX}"/var/cache/samba \
+		--with-lockdir="${EPREFIX}"/var/cache/samba \
+		--with-swatdir="${EPREFIX}"/usr/share/doc/${PF}/swat \
+		--with-configdir="${EPREFIX}"/etc/samba \
+		--with-logfilebase="${EPREFIX}"/var/log/samba \
+		--with-pammodulesdir=$(getpam_mod_dir) \
+		$(use_with dmapi) \
+		--without-afs \
+		--without-fake-kaserver \
+		--without-vfs-afsacl \
+		$(use_with ldap) \
+		$(use_with ads) \
+		$(use_with ads krb5 "${EPREFIX}"/usr) \
+		$(use_with ads dnsupdate) \
+		--without-automount \
+		$(use_with pam) \
+		$(use_with pam pam_smbpass) \
+		$(use_with syslog) \
+		$(use_with quota quotas) \
+		$(use_with quota sys-quotas) \
+		--without-utmp \
+		--without-lib{talloc,tdb} \
+		$(use_with netapi libnetapi) \
+		$(use_with smbclient libsmbclient) \
+		$(use_with smbsharemodes libsmbsharemodes) \
+		$(use_with addns libaddns) \
+		$(use_with cluster ctdb "${EPREFIX}"/usr) \
+		$(use_with cluster cluster-support) \
+		$(use_with acl acl-support) \
+		$(use_with aio aio-support) \
+		--with-sendfile-support \
+		$(use_with winbind) \
+		--with-shared-modules=${SHAREDMODS} \
+		--without-included-popt \
+		--without-included-iniparser
+}
+
+src_compile() {
+	# compile libs
+	if use addns ; then
+		einfo "make addns library"
+		emake libaddns
+	fi
+	if use netapi ; then
+		einfo "make netapi library"
+		emake libnetapi
+	fi
+	if use smbclient ; then
+		einfo "make smbclient library"
+		emake libsmbclient
+	fi
+	if use smbsharemodes ; then
+		einfo "make smbsharemodes library"
+		emake libsmbsharemodes
+	fi
+
+	# compile modules
+	emake modules
+
+	# compile pam moudles
+	if use pam ; then
+		einfo "make pam modules"
+		emake pam_modules
+	fi
+
+	# compile winbind nss modules
+	if use winbind ; then
+		einfo "make nss modules"
+		emake nss_modules
+	fi
+
+	# compile utilities
+	if [ -n "${BINPROGS}" ] ; then
+		einfo "make binprogs"
+		emake ${BINPROGS}
+	fi
+	if [ -n "${SBINPROGS}" ] ; then
+		einfo "make sbinprogs"
+		emake ${SBINPROGS}
+	fi
+
+	if [ -n "${KRBPLUGIN}" ] ; then
+		einfo "make krbplugin"
+		emake ${KRBPLUGIN}${PLUGINEXT}
+	fi
+
+}
+
+src_install() {
+	# pkgconfig files installation needed, bug #464818
+	local pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+
+	# install libs
+	if use addns ; then
+		einfo "install addns library"
+		emake installlibaddns DESTDIR="${D}"
+	fi
+	if use netapi ; then
+		einfo "install netapi library"
+		emake installlibnetapi DESTDIR="${D}"
+		insinto $pkgconfigdir
+		doins pkgconfig/netapi.pc
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}"
+		insinto $pkgconfigdir
+		doins pkgconfig/smbclient.pc
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}"
+		insinto $pkgconfigdir
+		doins pkgconfig/smbsharemodes.pc
+	fi
+
+	# install modules
+	emake installmodules DESTDIR="${D}"
+
+	if use pam ; then
+		einfo "install pam modules"
+		emake installpammodules DESTDIR="${D}"
+
+		if use winbind ; then
+			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+			doman ../docs/manpages/pam_winbind.8
+			# bug #376853
+			insinto /etc/security
+			doins ../examples/pam_winbind/pam_winbind.conf || die
+		fi
+
+		newpamd "${CONFDIR}/samba.pam" samba
+		dodoc pam_smbpass/README
+	fi
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		einfo "install libwbclient"
+		emake installlibwbclient DESTDIR="${D}"
+		dolib.so ../nsswitch/libnss_wins.so
+		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
+		dolib.so ../nsswitch/libnss_winbind.so
+		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+		insinto $pkgconfigdir
+		doins pkgconfig/wbclient.pc
+		einfo "install libwbclient related manpages"
+		doman ../docs/manpages/idmap_rid.8
+		doman ../docs/manpages/idmap_hash.8
+		if use ldap ; then
+			doman ../docs/manpages/idmap_adex.8
+			doman ../docs/manpages/idmap_ldap.8
+		fi
+		if use ads ; then
+			doman ../docs/manpages/idmap_ad.8
+		fi
+	fi
+
+	# install binaries
+	insinto /usr
+	for prog in ${SBINPROGS} ; do
+		dosbin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	for prog in ${BINPROGS} ; do
+		dobin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	# install scripts
+	if use client ; then
+		dobin script/findsmb
+		doman ../docs/manpages/findsmb.1
+	fi
+
+	# install krbplugin
+	if [ -n "${KRBPLUGIN}" ] ; then
+		if has_version app-crypt/mit-krb5 ; then
+			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		elif has_version app-crypt/heimdal ; then
+			insinto /usr/$(get_libdir)/plugin/krb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		fi
+		insinto /usr
+		for prog in ${KRBPLUGIN} ; do
+			doman ../docs/manpages/${prog/bin\/}*
+		done
+	fi
+
+	# install server components
+	if use server ; then
+		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
+
+		diropts -m0700
+		keepdir /var/lib/samba/private
+
+		diropts -m1777
+		keepdir /var/spool/samba
+
+		diropts -m0755
+		keepdir /var/{cache,log}/samba
+		keepdir /var/lib/samba/{netlogon,profiles}
+		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
+		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
+
+		newconfd "${CONFDIR}/samba.confd" samba
+		newinitd "${CONFDIR}/samba.initd" samba
+
+		insinto /etc/samba
+		doins "${CONFDIR}"/{smbusers,lmhosts}
+
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins ../examples/LDAP/samba.schema
+		fi
+
+		if use swat ; then
+			insinto /etc/xinetd.d
+			newins "${CONFDIR}/swat.xinetd" swat
+			script/installswat.sh "${ED}" "${EROOT}/usr/share/doc/${PF}/swat" "${S}"
+		fi
+
+		dodoc ../MAINTAINERS.txt ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
+	fi
+
+	# install the spooler to cups
+	if use cups ; then
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	fi
+
+	# install misc files
+	insinto /etc/samba
+	doins ../examples/smb.conf.default
+	doman  ../docs/manpages/smb.conf.5
+
+	insinto /usr/"$(get_libdir)"/samba
+	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
+
+	# install docs
+	if use doc ; then
+		dohtml -r ../docs/htmldocs/*
+		dodoc ../docs/*.pdf
+	fi
+
+	# install examples
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+
+		if use smbclient ; then
+			doins -r ../examples/libsmbclient
+		fi
+
+		if use winbind ; then
+			doins -r ../examples/pam_winbind ../examples/nss
+		fi
+
+		if use server ; then
+			cd ../examples
+			doins -r auth autofs dce-dfs LDAP logon misc pdb \
+			perfcounter printer-accounting printing scripts tridge \
+			validchars VFS
+		fi
+	fi
+
+	# Remove empty installation directories
+	rmdir --ignore-fail-on-non-empty \
+		"${ED}/usr/$(get_libdir)/samba" \
+		"${ED}/usr"/{sbin,bin} \
+		"${ED}/usr/share"/{man,locale,} \
+		"${ED}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
+	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+}
+
+pkg_postinst() {
+	elog "Samba 3.6 has adopted a number of improved security defaults that"
+	elog "will impact on existing users of Samba."
+	elog "			client ntlmv2 auth = yes"
+	elog "			client use spnego principal = no"
+	elog "			send spnego principal = no"
+	elog ""
+	elog "SMB2 protocol support in 3.6.0 is fully functional and can be "
+	elog "enabled by setting 'max protocol = smb2'. SMB2 is a new "
+	elog "implementation of the SMB protocol used by Windows Vista and higher"
+	elog ""
+	elog "For further information make sure to read the release notes at"
+	elog "http://samba.org/samba/history/${P}.html and "
+	elog "http://samba.org/samba/history/${PN}-3.6.0.html"
+}
diff --git a/net-fs/samba/samba-4.0.11.ebuild b/net-fs/samba/samba-4.0.13.ebuild
index 63aa7af7a989..684a0dff7e98 100644
--- a/net-fs/samba/samba-4.0.11.ebuild
+++ b/net-fs/samba/samba-4.0.13.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/net-fs/samba/samba-4.0.11.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.13.ebuild,v 1.1 2013/12/09 08:44:49 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -136,14 +136,11 @@ src_configure() {
 src_install() {
 	waf-utils_src_install
 
-	# Seems like the build script gets the shebangs correct by itself
-	# (4.0.6)
-	#python_replicate_script \
-	#	"${D}/usr/sbin/samba_dnsupdate" \
-	#	"${D}/usr/sbin/samba_spnupdate" \
-	#	"${D}/usr/sbin/samba_upgradedns" \
-	#	"${D}/usr/sbin/samba_kcc" \
-	#	"${D}/usr/bin/samba-tool"
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
 
 	# Make all .so files executable
 	find "${D}" -type f -name "*.so" -exec chmod +x {} +
diff --git a/net-fs/samba/samba-4.1.1.ebuild b/net-fs/samba/samba-4.1.3.ebuild
index ce633d296050..40b06f23cece 100644
--- a/net-fs/samba/samba-4.1.1.ebuild
+++ b/net-fs/samba/samba-4.1.3.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/net-fs/samba/samba-4.1.1.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.3.ebuild,v 1.1 2013/12/09 08:44:49 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -128,14 +128,11 @@ src_configure() {
 src_install() {
 	waf-utils_src_install
 
-	# Seems like the build script gets the shebangs correct by itself
-	# (4.0.6)
-	#python_replicate_script \
-	#	"${D}/usr/sbin/samba_dnsupdate" \
-	#	"${D}/usr/sbin/samba_spnupdate" \
-	#	"${D}/usr/sbin/samba_upgradedns" \
-	#	"${D}/usr/sbin/samba_kcc" \
-	#	"${D}/usr/bin/samba-tool"
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
 
 	# Make all .so files executable
 	find "${D}" -type f -name "*.so" -exec chmod +x {} +
@@ -149,6 +146,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
 	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
 	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
 }
 
 src_test() {