3.5.11 version bump, confd fixes, conditionally install pam_winbind.conf file

(Portage version: 2.2.0_alpha50/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

1 files changed, 27 insertions, 5 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 47a53052d5db..d1c9d8783963 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,8 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 3.4/lmhosts 126 RMD160 c4ff63cf01158809311c97c768463826aa02127b SHA1 2d5be4b38357287050b25bbd9fdc3263801676ce SHA256 b4b9cad6cd728dac260f4716270bb5df09da5c84c76526ccbe6cccdb8818c56c
 AUX 3.4/nsswitch.conf-winbind 406 RMD160 7bbc3f7a4bdc4907bc45ad71fc0e17cc376d4e1e SHA1 0cd4966690d98802de94f0353ecf760c1a6d5245 SHA256 342657852ec465f78b1450a522211c2102ee07a65f8cb167a19ca5e277220867
 AUX 3.4/nsswitch.conf-wins 392 RMD160 bf1c0b6c3128be82a3f901eb3ef70d6d621df334 SHA1 2742757c188bfeae94d272eed66405e1a5417540 SHA256 508f76bc1abe15b49ef97b6033ae873f6d630bbcb99cd69b9babe55dc2554ea0
 AUX 3.4/samba-3.4.9-kerberos-dummy.patch 1564 RMD160 2c191039ced000dee21196022bacab9aca28484d SHA1 8fe01a09c2843cc98b1b4d6215242ca978771e1b SHA256 bd211b06000c9ba7cc2e454333d6c5bbf70702f26056481c4ec0e50e98c0cbe4
-AUX 3.4/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a92a63dbbf9f7079e9d7cf0e2e3d608594fe5d42 SHA256 a83004571c4bc37eeaeec8efa0fef4a20d9fc12ec30f2eb9dcc6098251205314
+AUX 3.4/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
 AUX 3.4/samba.initd 1228 RMD160 9d6b0c510277f0430562175752b128e6b078b0c1 SHA1 2a7cd4852d73ce378e3f051c11fd1ae509c70b96 SHA256 a827bdeeff845f495bcf573bf51937c7988eb651fef69aeaa1752a808c08a97d
 AUX 3.4/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.4/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
@@ -14,7 +17,7 @@ AUX 3.5/nsswitch.conf-winbind 406 RMD160 43175297fb2ca9e364a7e07e6b1f7cec367f36f
 AUX 3.5/nsswitch.conf-wins 392 RMD160 58b135036c4a7ecab97bf532b35da3d50693c4bf SHA1 7945e42a4d72e4604678add14ecdbb9bde8e9894 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8
 AUX 3.5/samba-3.5.6-kerberos-dummy.patch 1660 RMD160 a1077508f2a6a7ec2c9fb14f563be1baacdee4ed SHA1 708299aefaa213269065328475e5580925ace548 SHA256 bcc2b4ad1a4ff92221b4620cb1cf2915db19c527fb28308db7ef633c0e1f596e
 AUX 3.5/samba-3.5.8-uclib-build.patch 1750 RMD160 88cfa51290324bc71d7c7d982928f55ec5e8b354 SHA1 47a21922c1f5d78b881026ebf91b0583eead6f56 SHA256 ec3d8a21fcc41a65b0dd6ae8312b3da0705628ea1002e9e79574c5e20cbe689b
-AUX 3.5/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a92a63dbbf9f7079e9d7cf0e2e3d608594fe5d42 SHA256 a83004571c4bc37eeaeec8efa0fef4a20d9fc12ec30f2eb9dcc6098251205314
+AUX 3.5/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
 AUX 3.5/samba.initd 1228 RMD160 a4c5502dc1234d18eb7810899e171987ad33262b SHA1 b1d6d1ff47e3d2c0f96dfb2743915404ae6d59c1 SHA256 691b7389b87a5b413487443e3569e95b99208bd8d9f7dfaf9d54b42a5fc2d41a
 AUX 3.5/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.5/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
@@ -23,7 +26,7 @@ AUX 3.5/smbusers 218 RMD160 a94e0928466c0ed7cfd3edd3ac88dd1c8725a987 SHA1 84518d
 AUX 3.5/swat.xinetd 527 RMD160 8b2364e6fda8cecc75feef8129347ebc545ecc43 SHA1 98f94bc638ffb68d6fb35745aebbf0c63d4135ce SHA256 7919926945c9a7a28446280ea477aed2d7d3506372a03cbea96b446a8fa39aa4
 AUX 3.5/system-auth-winbind.pam 705 RMD160 666533e99283449d60a97fd4fcd704d72212b871 SHA1 a1fe11d7a4f7501c938c03121e4ad950c515f75e SHA256 eca81593dc1b3e2be19bba7a128d71474243216a7783ed788320ca51cf6ea6c7
 AUX 3.6/lmhosts 125 RMD160 352d66c815ec164196bc9daf70b08b36d1447972 SHA1 ee122d2e006c8dc1e1f0a72db76bb6b3c326d849 SHA256 0bcbc9c3cfb44e31ccdc0930a1bcacc4e2b0fd96e5d38a56234a5133707a1826
-AUX 3.6/samba.confd 1219 RMD160 88949f00ea94f14af751e53cf870b6481dc3770d SHA1 a92a63dbbf9f7079e9d7cf0e2e3d608594fe5d42 SHA256 a83004571c4bc37eeaeec8efa0fef4a20d9fc12ec30f2eb9dcc6098251205314
+AUX 3.6/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
 AUX 3.6/samba.initd 1226 RMD160 6e4b32fe49d319dd8e80c6695bd2111c9c51622d SHA1 19ddcec9155a5408a5233e0bed3571ee622859a3 SHA256 9ca1ca4d2af609675f049f296f1573746481c91a522a505c1b2ee80eb5726d9b
 AUX 3.6/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.6/smb.conf.default.patch 2385 RMD160 807cc1e9d18e41d4f15fec2ef675bc8bbbdeab92 SHA1 d3244cf26702945fb686a0fbf75be8adc161f379 SHA256 2140436e553e5dfc0b472e3a09a597de61f15847f23e8f92b9f561a6b9164034
@@ -34,6 +37,7 @@ AUX samba-3.4.2-lib.tevent.python.mk 177 RMD160 3ed0264790f5ce15106528cd485c8361
 AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0bcdb1783f1fb2ed256442f051b98ad70d64 SHA256 df553df5cfb8d8305566accd62bff23dac4772ad4a2eb7d3b1328a5651113cad
 DIST samba-3.4.12.tar.gz 34842685 RMD160 b78ae82371fce179cddb8dfd508d8075788082d0 SHA1 89c18711cf585de415c4e7e50e83596dc583cc3e SHA256 89c0862a683d1c5f0b8710df1ae6f628aa4530bbe5cbb11cf7415b1b0446f028
 DIST samba-3.4.13.tar.gz 34805783 RMD160 da4cdb57bec225fa35b1a6e889f1c49beaaf5089 SHA1 1318670371c55fe7383d583c5d184cbef7c6e5ea SHA256 f2725e66f6d4e0120c44ba22bc4461654a4222ae9881d04157dcc1faccbbffe4
+DIST samba-3.5.11.tar.gz 30752782 RMD160 b3ee1e044e9df417b0dcaf954a6a137db742cba3 SHA1 0801871ab6a11f7d8eb8bf32ff0b87896d263441 SHA256 fba5b7bced99a0651148d74f40031ac3ca3fc7869e2998bc85bf6fb3ddb16597
 DIST samba-3.5.8.tar.gz 30721269 RMD160 02703bbaf7d7e7b9786a2228fe6085143c99251a SHA1 ffb71de38442eee14aafb44f819671354dc5cce9 SHA256 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796
 DIST samba-3.5.9.tar.gz 30750297 RMD160 c48b3d0ecf0b4cde2764cebdde5f8513320cd966 SHA1 77da3dff05032950fa1943057182d16894591a05 SHA256 8af8dccbb87a70a71f795180d873102b5cccba7012d66f2620cea8b87174380a
 DIST samba-3.6.0rc3.tar.gz 28990368 RMD160 5255ecc79d80bb68219587745735fb1d880c1deb SHA1 97dedbcc09fe0d1b7a7e3c723fc78a1d631eacb1 SHA256 4e058128cbf030f1497858be74ad18a746be21b527498ec6c43ec72a4d995d1e
@@ -43,13 +47,31 @@ EBUILD samba-3.4.12-r1.ebuild 11854 RMD160 6a63fd620d63eceedd349ff08de3a703c0e4a
 EBUILD samba-3.4.12.ebuild 11868 RMD160 f4a947beec3cceb95e1241991a827e673913aee3 SHA1 76ef9617d3604eb6941a13bae2f92e2816bdc223 SHA256 b72494103bf6f78691ec952bd878687b56671a1914e305a56a4728d22a410bb1
 EBUILD samba-3.4.13-r1.ebuild 11854 RMD160 6e520ff4a3df257390bfaa2c042f8cc548ce3c2a SHA1 6d6099f346122119dc11a9a8f10a7f73c7d5c7f5 SHA256 bdfaa284ceff33d7bac0880b704cd60699f86ff305834595c8f32a044e8e35a9
 EBUILD samba-3.4.13.ebuild 11879 RMD160 d8fe5d3ad76b26f653f4c2f8a62d57e748fb113f SHA1 217edcd9a75b23de4328d8f6cdbe441565bbc25a SHA256 9bb1cbe6642d07e12eb8f0e80228405fc5e09cb4f16bbf9f2c291d5750ef6c5f
+EBUILD samba-3.5.11.ebuild 12077 RMD160 ef50ba69a07d13a0610d395b50b82da10c7add97 SHA1 019a297d28852b6b6ab6e866330e92d2a6cda1fa SHA256 14060a71b8b51a16319df64532cc110d05d42de98a77584b856d683895728866
 EBUILD samba-3.5.8-r1.ebuild 11968 RMD160 0b559c0d46a4e6493971616a765053e2ce216be3 SHA1 13b3686487563435be413ece26de403ebe59f8f1 SHA256 964102b971bf1c3db52b0673363f89250561f335601a9a33f3df1f2483c74917
 EBUILD samba-3.5.8-r2.ebuild 11934 RMD160 8025dc5078f57a10e1bf54f7d39d72828b464c87 SHA1 ef266e0a9c38be685fe105fa7294f12adf1da88a SHA256 3e5aafb910df330443eb320b4b90a418e1432cccacc3a0a0b4b1cf5bcbbd9e8b
 EBUILD samba-3.5.8.ebuild 12734 RMD160 3d4145c2be91bb05498adbbd507ced25df9aff91 SHA1 f30d7d7e16e365d421ef79a90efc20d1729b7e0f SHA256 cf6f724a69d82644ad4a4be64aed243775c44d55fbf7d69acf443d175c91b110
 EBUILD samba-3.5.9-r1.ebuild 11977 RMD160 32eb1694399213c535e9ac0b335650b7e52ec75f SHA1 44f47d5444ba5fc56271251e0066ac0bbda99663 SHA256 c60be18861ac486b7d881a0c1636fbb20316680009144bdbb84af07e9e17dcdf
 EBUILD samba-3.5.9.ebuild 12008 RMD160 d4053610ac661eb0e3ea485f587dd4b4032ffc05 SHA1 6b3114748e010c7b5f3a2e42c689e6f4432c615a SHA256 bd4aa352db979cace6634c8df1221c6e0393da8678de64e92c1cacf716adc4b7
-EBUILD samba-3.6.0_rc3-r1.ebuild 11214 RMD160 c3a874e9131de96dd36ee67fc37b788f6b82a8ca SHA1 02a9bba6d6d204512ee2b6cc8f050153e60e1b6c SHA256 ac0f6308ba4c789291b99a641abd556820d5e1dbebfdba03194ba03f116bc676
+EBUILD samba-3.6.0_rc3-r1.ebuild 11316 RMD160 31390f5d3d2c1dc1ae27298ff453e834564f64ca SHA1 c6b30ad6a173d2e8959666710b3e88f1d021678d SHA256 aa32d235eeddb574ed41d0f7734e61495f1ccff336e290bfb726fc767c2b98dc
 EBUILD samba-3.6.0_rc3.ebuild 11213 RMD160 e100cff24e7f0b6539884d767880bf948592dcea SHA1 226ae89aafbd5f02bfbac2b984296517be1a8253 SHA256 4748979f3c755cc696ee045c0c586f6878e1da15262a24ce44edb6291f94b585
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 79937 RMD160 22e3e91a0cf20a323ac87b581f1310d0ca060eb4 SHA1 32fc32f8b149d3653db6cdf5392e2799cb36ccef SHA256 29fc60b6255d604e6d81558335e0d7696d5dab4e5d8416426d9defc8e6c601d4
+MISC ChangeLog 80362 RMD160 79f1e4dadf8401a084aa69c7f556749e4fa9b34e SHA1 d2369be1dbe8f9e4034d3aa3bba8b472901e2dd5 SHA256 40e2db1d210402081afa76486a73eb88095f4baa705d61b371e26ca67245f342
 MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOPvG8AAoJEPiazRVxLXTF+3YP/3c21izcralS5kd9anILxc5h
+QA4x7Y/NQHpiznT4A7rBinUsPOCOG7SdObB66kYwgJw6YD8/l2M3qHi6i156ufKH
+q6cHm60nbQqcjS0bi9ByICHio0TriRBWmH2erD5YCQds6Pu1hM4k5yEul6LyiYXR
+85W0KOQQE09LtXn0M7D/V+rierA9FsNq/bEe8cxy6LrcMoNbf1KwK1eBAA165aHH
+zuJxrlueMq7VfaXZ+lhiLJNVdwYFjoFbQEX8DXg3FTG7+yAvSkOhdt0YaXwCJl9q
+HXvdxcFp0MApdboxPlluz0JIctWnaZKy3U/8+nS3xfOvOz1drmE9PgIsfz2VzQr+
+6cuVndGNCDsGVEhCLaSZL7SrNbHiLwzml6IQgVJ8MvohTFsS9kLWBh87Tf3JK3qg
+A7NbpaXo2Sx6CUkPM6r74F2R3CDi3RdTd4jTRbcVxn4Ot1T/7KZDOfgGRiQ0ptLm
+rYgDUqDRPL+TnpBCfaPLKRnRrGmJcin3NZU4ah73WtY25BB7Op8xLqv1MoPKFOXP
+oPr61BTlKwFj167D35z3R+bTTbImYzL4hpskubudCWUU+qv6RetpiQ8lrW5l32Ti
+QEthPyvtNro9R8yvVTlL1CDdtWUNjHGawfh+DSdgFisX43LTn3sShDRwdUEohkIz
+8bc++8+Oa8RzA9bm0Cmm
+=N6Sc
+-----END PGP SIGNATURE-----