gentoo resync : 15.11.2017

6 files changed, 23 insertions, 4 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a6999eaf3140..4201720bbc4e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -7,6 +7,7 @@ AUX samba-4.2.3-heimdal_compilefix.patch 819 SHA256 6cf93d127aa900c1e9a4fb8a3bdf
 AUX samba-4.2.7-pam.patch 1273 SHA256 e1abd99fcf4ff721dafa64c77a60b07962e3e818eaf5d10fecead61a2af81e07 SHA512 5f900ebfdfb15af38814864f7ec8cd52d3525098d6f2017ab2f29d301e6a0e622d2ab37976fbd97180cbfe23c7853e91ab7966655eb46ebd9bdd2951205e46bc WHIRLPOOL 91e1fc2e49944d1ded93d902fc50437763388a12b8c2eab70e2dcd8124860746c71fa8b4c26e7b43e5ebc2c0fc94c4c005a2c1eb8b9af68e77c9c6cc1d92927c
 AUX samba-4.4.0-pam.patch 895 SHA256 a7f91da7da039346e9497addef7e644ef1290b5915a43fb9cc76200294022eb7 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c WHIRLPOOL 48e4853bb284ba0bf54262a951ae8045075179c51dbb27689a31c0eba61f1ddb707e1adf62e5e67940c239ea7bc4d1691e6eb8d21781fd9fb30cb76a32cc229b
 AUX samba-4.5.1-compile_et_fix.patch 762 SHA256 49039beb8e96139b32c733e876f6dbdfb764dc51fc3b963d5485aad33641628b SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24 WHIRLPOOL 93e57f6c5cff7a1b24a71cce6c584f2a12560b38a5841bf888e6f5d8323801b4aa7ac5fe1bf06cdd7739d284509c07f465c03a07de1b9aa03d7c9988a59cb4c2
+AUX samba-glibc-2.26-no_rpc.patch 631 SHA256 506aab93f5ecdbd61d5ca9ecd6cbdf4702a2da8eb1b5c02fedae0d8b7b7c475d SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541 WHIRLPOOL 0b197c84a60e75b62c4d5ff309ebe2dc5ffc1c389d9a2d5f52a3737e54fa170946307e386472c73400312bd81dcfe730128078abcbd55a9c0255af81bcbfd352
 AUX samba.conf 61 SHA256 e4fc68bc14a44e3c452e767d996ff693d131da317eb513de10d752dd96cb6f12 SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e WHIRLPOOL ad21bc3738c2ec721ad3be746c66719385390835c7f4da881fc0cc1c982bb6821a56300157b1169d1a35264e44dab1a0c29cd9919455a02a8f4c53c665a4bed3
 AUX samba.service 199 SHA256 0ae738fa2a15b476dbca016dfa4e1cf4b8c4a575e13edf518eb70b615c02a059 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16 WHIRLPOOL 1132081b63b1e0e1a9342d59493ebfe1d918133a4091e48c42dae7845dcaa24a0b8e7a1183d5a41b0173c3f6dbc17838a9b7a6297fc8ea0775ab150a22ae3151
 AUX smbd.service 250 SHA256 e1f5da902cd97891852f6463b2c7eddbc61e7fbd3e3c281028a806319627fc68 SHA512 a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3 WHIRLPOOL 18b6a57603a41303d207249fdb46cb4f6e887f8b9bd4921dca6b4f28a59951368d6abead2dc9d3be2c09cb2c9f295087ef5f20d121a309791b9031e3fad28b13
@@ -26,14 +27,14 @@ DIST samba-4.7.0.tar.gz 16830569 SHA256 bd16d169988eb513e685a87e9964a5210482498f
 DIST samba-4.7.1.tar.gz 16844730 SHA256 7ba932523c821ebfa4c31ebd183f7aa20d663059f9761563fcdec85cd1e9be1a SHA512 eaaa494501e0029fab8b0f1789fb28d33104a51b7365ba53741218786a4331f5adc5ea86d65aac1ccd970103c74a99fb875c4ba74460bd8b4597aaefbab18c7c WHIRLPOOL 1a09be343d47d2e61e7f236bd7ba4817de990f722a6e130150a0043ccc29da453e90b2eaf8443a48c5491bcbcbb0070b1ca72a3b5b25ec94759981ea13cb712d
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
-EBUILD samba-4.2.14.ebuild 7053 SHA256 ca745956acd5edf8629e20e3ae1e3b3656a1af580f2689295d9ab9326e392700 SHA512 38ffb1af7b80d82e93da2c93006fab9d754cef8073f74a97ddb9beda5c4a34388008169508bdfadfe8da9a0eea0b5cc56a72d92e93aa6dd65a5d329d56d8c085 WHIRLPOOL bdcdf28f679476cf170eb4d17a56e2a2ddcd7bf3bbecb724d1dc5c52e8ed7707a67ff6d03b650d8e4ebfa4d29a23b2cc0edbfcbcb7f6bf78f8dc605c37057ddb
-EBUILD samba-4.5.10-r1.ebuild 7743 SHA256 3e2638a7e963fd659ac7fc18b21dccb65fde5b901627333a7ba0d7d06cf778dd SHA512 b04a1ea862ecf882f69037ee3b4d55ba96bcec6cb70b50accb89e277587530a8ef0ae8500446981492176e46969b8b1db40f924dd7e23e1070e1f618a75d6931 WHIRLPOOL ed8f316d05a0fb7d9d70f005c2da74c05ef715b73426ab7449a68eb36e74f009a5cfa426ec1610555b535b971a3b6f6cb538b0e6f4167fe1a320788fca2f50e6
+EBUILD samba-4.2.14.ebuild 7106 SHA256 e14e51733f2b82b1dca3f7f2e3c58b71ebffc286e7d9f4d4d4441b0a571fdc44 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e WHIRLPOOL e9cbf0bd9fb2f2697502990fee3e830fc61c1864c4b9f5579993fddb6ac363805b8e48ba7b0328da95fbf2a1fb1c350fe91f2a78525cbcbd2d7e9e25f19a2670
+EBUILD samba-4.5.10-r1.ebuild 7796 SHA256 467b4808ef2dc2f1f652fe9bbc11260ed2ccfd7ba66dd2d8b95dbb621c8d2bf5 SHA512 6e5abd4cbf145ba5b429ae6f62314cee3334c5f7eaded7563bfbe08853370b5dc7598e1f020ea5b6026a0cc630dd208cf61c15bfe860bc037706c03c24180c4c WHIRLPOOL b8da7f2f2ecf74044e0981b53b0cd8710eec598b04ac54ea33b06bb79eca011e4dba6568afd972f05fdaef77b5aaab187586962418c2248280b6e3ae8f772505
 EBUILD samba-4.5.13.ebuild 7808 SHA256 28c209d67f0653b8dcadfbaa4733e180edca40eb2bd33e4cb974bd61a057603b SHA512 5ab5bf2cb15c17390e8ee720e493f3119262a7c89d0e0447fc1cf504647f945873ac8a6fe67799e6621630b49e42ab53fa5f4b289af37912f577f3e9b2d35b29 WHIRLPOOL 3ba40b2c3c66706adcadcd2cd3fcaed3f9c5233b66c7e5a145fb6193ee0d38dbd0a305f2ed6960d752f683526608e2709a937b9c393972269f2715838d074e0c
 EBUILD samba-4.5.14.ebuild 7797 SHA256 31b9e91ac0a2ef2711b17a346a5a43b32dd1116cf0ad5611668b997adb09adf2 SHA512 a45c3285315eb47503df08dd9c027f75b31c5450da026108487d24ea3cdae88129ea9f886fec716b6fbbc995ee32f83d78714b2494f75006979d01e0965a2076 WHIRLPOOL f75074ea63cc5fde0e167b046665df978439ef027df6c74f04395fa072b4af872139ba898fec9665dbc6fc7cdd051cef0af1cf9a847b09bdf234fabe11b66152
 EBUILD samba-4.6.8-r1.ebuild 8552 SHA256 362966dbb3a0ada15dc83094d153b7b2c584222202b6a8a5c9cce4e360a7873a SHA512 1cd2018b46dba9f49778dc15552969ee88056bbfeedfb32915bd3a3f7157d997490f86ddc0e85f7ead0bf6e688461fcfe90a818595d8e9d27293602b80882ba0 WHIRLPOOL 470bccc391cd0ff3796474fb41c509882f873606825e33417255969f9bf3a00097999334a19a2c08f6a37f7d772c81f58a8b6798c7aded5c8381db2296f97b9d
-EBUILD samba-4.6.9.ebuild 8623 SHA256 378ead6c80dc05395eeee5a2c1b7a3d6a6ef61aa5362d83fbdbd3ae68d4bbf42 SHA512 d2e8225495f8510721c48dc037450f636c69248d49afd7de2aae4519f17eddd58eaf47431d3b60c6627459532e38af696a6bfef32e92af20f8a7da8d733e864b WHIRLPOOL d27eda23197f11b92ad4a060ec83fd5bbd40dcbf081085d4991ccd459b2bb61d6042f96a244665c693d9505e732f96694f2c323caae3d0d03a0a79920e74f141
+EBUILD samba-4.6.9.ebuild 8676 SHA256 903a479781086e4fab9d078060f13ffaa2a67527744367a15ee149bc5e00c2ee SHA512 44f313233e5174b2e8d7f59f1bb6f66d6e978e4eaa61c6aea996d9f1100562bd23a7ffe2ed2c212de106c2267bd3fd598e51cdfc063e6657a536a8730f28f392 WHIRLPOOL e883c0047edd07cf56dbf4f12d5cc60e9d508c599e6c2bc0dfdc68843e8d7e59c660ffc28ee9e22ad651ecb9da93c6460f2f5f3570f44f770de8dc9738c542cc
 EBUILD samba-4.7.0-r1.ebuild 8446 SHA256 f91ddd196652a402f4348ef0a4ebed9b405e10b4bd4daa301bf956da20c9c7c1 SHA512 a6c25a3aca9fbd258e1803e887b2a7e3759ea9be8ddb5cd3b404ce71e27f0697ba7960ca5623bd7ec35fea00ceff1408a30917f727ddfdd59089b280751ca822 WHIRLPOOL efffb727735b1251b630743e7dc8462dcdfb4d7b9dd5c90da1390d582165298e83bc1fd08e1b4b55e2aca184392148716f27a3e245d78c0d6760e56a35da58cd
-EBUILD samba-4.7.1.ebuild 8435 SHA256 7f6e67c6580fa740b524f2c4c9cf700601671cadcee916c026c960fa14bc6df0 SHA512 7cc4c8fa7e58ad2d6588881181cab128c51f79b3297d0412bd6e7dbdc272eeba230f9cd0e4d49a14eebebf14909d8e74fb5e00749bbebbc2541fe3e825e9f0b4 WHIRLPOOL e926e5929bf8c58aaa8f599236beccd10add0032df1a97671dc69da12bca0d624a0c6a7580a8158c7f3ca453ca79d1bfc9bcd56b1d77a2e050b2bc1086822c5b
+EBUILD samba-4.7.1.ebuild 8488 SHA256 fc8e8b257335298ce92c7f7dd74a8cad617e3617cab6bc8157d6fb0fa62058d9 SHA512 550dc587c15156335d0279953dabb5317e9526acc3eea21bc32b8d1e94ac5a6bf7bc688d2c6e73ed6c5800c39f4b36b46deab05ff65b68786874c173ad515b53 WHIRLPOOL 7050a48b94e9d251c62959b0b2cdd719b74b74008c33daf510e61979154df3bc4cf5a89b664c1f40352f66def804ebdec520884d872c0b3444f5afc7307343e0
 MISC ChangeLog 29865 SHA256 9fdf9b583855db807230f491b4957583779bda1b46807e5a1f3fc3f16a584322 SHA512 6ac0456dcf57a73cb9ca984623b5fb4512b9cbcfd9189c3cbeeac5b2135aee2dbb99114e838c8f6438388d948da4ea7fe15712a38bcf834c75d414c538f460b4 WHIRLPOOL 271a5a1c45a6a6b5d41173c677e3c48053bf2aae078098ebdd8ab6de31defd2bbbc6679bbeca8f7a6426edeec9692ad2e86ff465ed7459f5800089ec1abc7a84
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC ChangeLog-2015 11570 SHA256 700ea64c0586d7957e3ef95425683f9bd711ae4311c7cd19575b6d1cdd814e94 SHA512 8d5d99a08a409db4cf8c8e9c3a82a080de66d9aac6ff39e53bb6eb5eeadb625d0ebd07c6fc81bce1755d2441ab91d96f90787d3975814f572e2ce2a366038299 WHIRLPOOL 340948bfd379c419985c93c21a543bb10d10a0c95c8ec2cf1d01697a3e47613b2b6e9f2292c1d03f353121a39b6be809ba432535ccab67b71adf333c69c5bc2e
diff --git a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
new file mode 100644
index 000000000000..e66446845f24
--- /dev/null
+++ b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
@@ -0,0 +1,14 @@
+https://attachments.samba.org/attachment.cgi?id=13172
+https://bugs.gentoo.org/637320
+
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -71,7 +71,7 @@
+     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
+     conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+ 
+-    conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
++    conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+ 
+     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index 0213488e770a..67fef98bf874 100644
--- a/net-fs/samba/samba-4.2.14.ebuild
+++ b/net-fs/samba/samba-4.2.14.ebuild
@@ -91,6 +91,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
 	"${FILESDIR}/${PN}-4.2.7-pam.patch"
+	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
 )
 
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.5.10-r1.ebuild b/net-fs/samba/samba-4.5.10-r1.ebuild
index 92ac19751e02..d21506da9c7f 100644
--- a/net-fs/samba/samba-4.5.10-r1.ebuild
+++ b/net-fs/samba/samba-4.5.10-r1.ebuild
@@ -102,6 +102,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.6.9.ebuild b/net-fs/samba/samba-4.6.9.ebuild
index 43d075a4a994..3f12fb2f123b 100644
--- a/net-fs/samba/samba-4.6.9.ebuild
+++ b/net-fs/samba/samba-4.6.9.ebuild
@@ -119,6 +119,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.7.1.ebuild b/net-fs/samba/samba-4.7.1.ebuild
index 8e9afc791ab5..e04ebce2c5bb 100644
--- a/net-fs/samba/samba-4.7.1.ebuild
+++ b/net-fs/samba/samba-4.7.1.ebuild
@@ -118,6 +118,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
 	"${FILESDIR}"/talloc-disable-python.patch
+	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"